-import admin code from external project
-working admin client - with hardcoded baseUrl in run.js
-moved code from run.js to jinja admin template
update docs for bower installation
-implement correct sorting in dgrid
Merge branch 'master' into private_frontend
upgrade to dojo 1.10 - fixes bug with trailing slash in REST calls (run 'bower upgrade')
-clean up store usage, add support for add(basic) and delete
basic form for adding concepts/collections
Merge remote-tracking branch 'origin/master' into private_frontend
concept form: support for multiple labels
Merge branch 'master' into private_frontend
Layouting concept detail
confirm dialog before concept delete
Merge branch 'master' into private_frontend
Layout contentpane + clean up concept open event syntax
Merge branch 'master' into private_frontend
Merge branch 'master' into private_frontend
Dojo security view
Merge branch 'master' into private_frontend
Merge branch 'private_frontend' into SecurityToDojo

Conflicts:
	atramhasis/static/admin/src/app/App.js