Merge pull request #1 from athahar/develop

Develop
Merge pull request #2 from athahar/develop

forgot password complete functionality; fixed session sharing bug
Merge pull request #3 from athahar/develop

Merge from master
Meeting notes changes
Resolved merge conflicts
Merge branch 'athahar-develop' into develop
Meeting notes changes
Meeting notes existing notes changes
Merge pull request #6 from athahar/develop

Pull from main repo develop
Merge pull request #7 from athahar/develop

Develop
Merge pull request #24 from bramwell2010/develop

test new logo, header update for contact link, commented out stuff from datetimepicker
inserting meeting notes changes
merge conflict resolved
Merge branch 'athahar-develop' into develop
maps to actual description instead of number
Changes for redirect
Modified for signup email
Merge branch 'develop' of https://github.com/athahar/ScholarMatch into develop
removed  debugger
Merge pull request #25 from bramwell2010/develop

new error functions, user id top right, minor css & logo change