ADD: first commit for wap branch
ADD: first commit for wap branch
Merge branch 'wap' of github.com:nnjme/reindeer_server into wap

Conflicts:
	Controller/CirclesController.php
	Controller/GrowthController.php
	Controller/UsersController.php
	Vendor/Utility.php
MOD: some new wap pages
Merge branch 'wap' of https://github.com/nnjme/reindeer_server

Conflicts:
	Controller/GrowthController.php
	Controller/NewsController.php
	Controller/UsersController.php
ADD: add redis used for cache
MOD: fix a getCurrentTimeStr use bug, add split imyDetail for wap use
MOD: record client os info
login first commit
delete some image
Please enter the commit message for your changes. Lines starting
Merge branch 'wap' of https://github.com/nnjme/reindeer_server
all show finish
commit register
Merge branch 'wap'

Conflicts:
	Controller/Component/QuickAccessComponent.php
	Controller/DefaultController.php
	Controller/GrowthController.php
	Controller/NewsController.php
	Controller/PeopleController.php
	Controller/UsersController.php