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.
commit1
Merge pull request #24 from SteveLobdell/master

Reports view and modify display dynamic data from DB
trying again
fixed report cont