Users..
user: delet + work on other functionality
validate password
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/services/account.js