user time limit set
Merge branch 'master' of https://github.com/TheFirm/time-tracker

Conflicts:
	controllers/ApiController.php
user total by project and date