zhengchanglong 39b6e98f3b Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/Controller/BehaviorLogController.class.php
#	Application/Admin/Controller/ExportController.class.php
#	Data/update.sql
..
Api 游戏 回调日志
Behavior initial
Common Merge branch 'release-1.0.0' into dev
Conf 礼包界面
Controller initial
Model initial
index.html initial