change some var name
merge code Merge branch 'master' of https://github.com/nnjme/reindeer_server

Conflicts:
	Controller/CirclesController.php
	Controller/GrowthController.php