merging admin interface from the dojo-admin branch