admin db stuff
Merge branch 'master' of github.com:startstar/codify

Conflicts:
	web/app.js