fixed urls
Merge branch 'develop' into feature/student_locations
Merge branch 'feature/student_locations' into develop
converted edit user form to bootstrap form
replaced form with html form, upgraded to google maps api v3, added thank you form
Merge branch 'develop' into feature/student_locations
Merge branch 'develop' into feature/LectureVideo