Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/views/user/editProfile.jsp
	src/main/webapp/WEB-INF/views/user/myaccount.jsp
	src/main/webapp/resources/public/js/common.js
Merge origin/master