Merge branch 'master' of https://github.com/taslove/CSC694-Assessment into taslove-master

Conflicts:
	config/application.config.php
	module/Reports/src/Reports/Controller/ReportsController.php
	module/Reports/view/reports/reports/index.phtml

Signed-off-by: Anand Kalelkar <akalelkar@nocrtl.edu>
Merge branch 'master' into test
Merge branch 'master' of https://github.com/akalelkar/CSC694-Assessment into test
t commiting so I can leave
incremental changes
added programs index view with pagination
Merge branch 'admin'
ldap changes
.gitignore changed to mirror upstream
updated report module
error
fixed conflicts
ldap config settings working
Merge branch 'ldap_task'
Merge pull request #35 from SteveLobdell/master

Added ajax to index page
composer fix
composer fix2
composer fix3
Merge branch 'master' of https://github.com/akalelkar/CSC694-Assessment
Merge branch 'master' of https://github.com/akalelkar/CSC694-Assessment