修改密码和修改邮箱
da
Merge branch 'master' of https://github.com/xici/microassistant

Conflicts:
	MicroAssistant/MicroAssistant.v11.suo
	MicroAssistant/MicroAssistantMvc3/www/scripts/app.js
	MicroAssistant/MicroAssistantMvc3/www/scripts/core.js
	MicroAssistant/MicroAssistantMvc3/www/scripts/user/controllers.js