account changes
Merge branch 'master' of https://github.com/junald/mantawi

Conflicts:
	src/main/webapp/WEB-INF/views/account.html