pages list page now functioning
Merge branch 'dev' of github.com:antler/caribou-admin into dev
Adding new tree.js editor and dep.
Page tree editing by drag and drop
Making editors more embeddable
Removed index search code from project, moved to core
Moving helper-injection into pages.clj
Changed the way columns are displayed in results view
get-in-helper more bulletproof
collection display a bit better
starting to hack locale into editors
Inject locale into request
Merge branch 'page-editor' into dev

Conflicts:
	resources/templates/content/pages/index.html
	resources/templates/layouts/app.html
	src/caribou/admin/controllers/content/pages.clj
Editor has locale pulldown
Merge branch 'dev' of github.com:antler/caribou-admin into locale
Wiring up locale UI elements
added admin. prefix to all route slugs
Basic locali(s|z)ation working.
More localised goodness
Quick js fix
More l10n
Merge branch 'prefix' of github.com:antler/caribou-admin into dev

Conflicts:
	resources/templates/content/models/instance/_action_menu.html
	resources/templates/content/models/instance/_collection.html
	resources/templates/content/models/instance/results.html
	resources/templates/layouts/app.html