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
Merge pull request #31 from tmfroem/master

Ajax right side
Merge pull request #32 from jgregorynoctrl/master

Set up Queries Sub module files
Merge branch 'admin'
change global.php database name to assessment
Merge branch 'master' of github.com:akalelkar/CSC694-Assessment
Merge branch 'admin'
Merge pull request #33 from jgregorynoctrl/master

change global.php database name to assessment
incremental changes
added files for queries sub module
gettting pagination to work
Database update - minor changes plus named assessment now
Merge pull request #34 from JohnCannonIT/master

Database update - minor changes plus named assessment now
added programs index view with pagination
Merge branch 'admin'
ldap changes
.gitignore changed to mirror upstream