syntax fixes and slimed down some code
fixed syntax on grant categories
fixed syntax on grant payperiod
syntax fixes and updates to functions
syntax fixes
syntax fixes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/apps/TimeTracking/controllers/TimeTrackingController.php
	app/apps/TimeTracking/controllers/TimeTrackingPayPeriodController.php
Merge pull request #18 from b-dub25/master

syntax fixes and code clean up all around.
Merge remote-tracking branch 'upstream/master'