fixed a merge conflict, not sure why it occurred
Merge branch 'master' of https://github.com/akalelkar/CSC694-Assessment
Merge branch 'master' of github.com:akalelkar/CSC694-Assessment
Merge branch 'master' of github.com:jgregorynoctrl/CSC694-Assessment
applying lost changes back to admin module
removed line to user generic queries in application
made modifications to user sub module to work with database changes and program submodule progresss
add/update/delete functions for users and programs
added form partial
styling user section and added updated onDispatch code to controllers
style program pages and added menu to each index page
modifing user edit proccess
fix issue with edit form not working and updated user update roles functions
fix admin menu
changed how roles and units were generated on form
adding new form with fieldsets and collections
working on new user form
working on fieldset form
got UserObj fields to bind
Merge pull request #47 from CSC694/master

Added user authentication method