Merge pull request #14 from b-dub25/master

getters
Merge pull request #15 from b-dub25/master

getters
updated
Added password recovery functionality
fixes
fixes
Set recovery token to NULL after sucessful password recovery
Merge pull request #17 from b-dub25/master

syntax updates
Added basic Time Tracking functionality
Merge pull request #16 from csalajan/master

Password Recovery
group study update
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/apps/TimeTracking/controllers/TimeTrackingController.php
	app/apps/TimeTracking/controllers/TimeTrackingPayPeriodController.php