SB Updated configs to allow the pulled project to run
SB merged upstream into my local branch
SB Removed the extra merging files from my local directory
I added add and modify pages to the reports module, Also, added working textboxes and typeaheads on all of the mockup pages
Merge branch 'master' of https://github.com/akalelkar/CSC694-Assessment
Merge branch 'master' of https://github.com/akalelkar/CSC694-Assessment
Merge branch 'master' of https://github.com/akalelkar/CSC694-Assessment

Conflicts:
	config/application.config.php
SB - Updated the Plans module.  The view page and modify page are now operational.
SB - Made the add page functional.
saving users with role information
got user feature add,edit,save working
adding comments
setting up program feature
Merge branch 'user'
Merge branch 'master' of https://github.com/akalelkar/CSC694-Assessment
SB - Added the Action drop down menu to all the plans screens.
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>
commit1
Merge branch 'master' into test
trying again