user model - has some issues we need to settle down
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/js/User.js