对m_user.php的edit_profie方法做了修改

change m_user.php
add appvars.php
Merge branch 'liuxc' into dev

Conflicts:
	model/m_user.php
Merge branch 'dev' of https://github.com/XimenTech/SHTP into dev