init
init
Merge branch 'develop'

Conflicts:
	api-server/lib/consts/consts.js
	api-server/lib/consts/consts.js.map
	api-server/lib/controllers/api_controller.js
	api-server/lib/controllers/test_controller.js
	api-server/lib/controllers/test_controller.js.map
	api-server/lib/helper/encrypt.js
	api-server/lib/helper/encrypt.js.map
	api-server/lib/helper/file.js
	api-server/lib/helper/file.js.map
	api-server/lib/helper/logger.js
	api-server/lib/helper/logger.js.map
	api-server/lib/helper/wechat.js
	api-server/lib/helper/wechat.js.map
	api-server/lib/repository/repository_base.js
	api-server/lib/repository/repository_base.js.map
	api-server/lib/repository/user_repository.js
	api-server/lib/repository/user_repository.js.map
	api-server/lib/routes/api_route.js
	api-server/lib/routes/index.js
	api-server/lib/schema/user_schema.js
	api-server/lib/schema/user_schema.js.map