edit profile, message
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/user/profile/edit/profile.html
edit profile, posts
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/views.js