LHX 1.Add modify user info
    2.Add modify user pass
    3.Modify layout.jade, when user login, it will be       change
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	dao/UserDao.js