Added user to DB
Merge remote-tracking branch 'origin/user' into user

Conflicts:
	www/js/app.js
Merge remote-tracking branch 'origin/user' into user