Changing admin to use the new admin project.
Merge branch 'master' of github.com:antler/caribou-development

Conflicts:
	admin/project.clj