fixes
Merge pull request #16 from csalajan/master

Password Recovery
group study update
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.
group study fix
Merge branch 'master' of https://github.com/mhender24/backend-laravel

Conflicts:
	app/apps/GroupStudy/controllers/EntryController.php
	app/apps/GroupStudy/models/Entry.php
group study fixes
group study fixes
Merge remote-tracking branch 'upstream/master'
group study fixes
Merge pull request #19 from mhender24/master

group study fixes
Updated Group Study Layout and Functionality