some fix
Merge branch 'master' of https://github.com/yanjh007/carsfull

Conflicts:
	server/app_cars/config/constants.php
	server/app_cars/config/routes.php