Temporary committing
Merge branch 'master' of https://github.com/ZCLanner/TrackStar

Conflicts:
	protected/controllers/ProjectController.php
	protected/models/Project.php