Database management started by user login
Merge branch 'master' of github.com:jontxu/AppGenerator

Conflicts:
	app.js