zhengchanglong 15695d5b5d Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Application/Mobile/Controller/SsgController.class.php
..
Common initial
Conf initial
Controller Merge branch 'dev_zyx' into dev_zcl
Event initial
Logic initial
Model 我的礼包界面功能完善
View 手机注册-修改账号密码验证规则