try account edit
db and login.html
Merge branch 'develop' of https://github.com/yanshixing/dmss into develop

Conflicts:
	veterans/static/js/controllers.js