haven't finished
update
Merge remote-tracking branch 'origin/update' into profileFunction

Conflicts:
	index.js
	public/js/app/model/profile.js