fixed urls
lots of cleanup, replaced urls with reverse and url namespace params, also fixed urls and renamed the video tool file.
Merge branch 'develop' into feature/LectureVideo
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
static file paths, try/except block, javascript cleaned up
Merge branch 'develop' into feature/LectureVideo
moved google map javascript to separate js file, updated map template to use base.html
added showing # of n videos to main page
Merge branch 'develop' into feature/LectureVideo
merging develop into feature/lecture vidfeo to get updates from develop
created tool dict in local.py and moved secure settings according to new setup
added config to qa.py and added check for the condition where there are no videos for the site
updated text for no videos
minor code edit to more button
Merge branch 'develop'

* develop:
  minor code edit to more button
  updated text for no videos
  added config to qa.py and added check for the condition where there are no videos for the site
  created tool dict in local.py and moved secure settings according to new setup
  added showing # of n videos to main page
  moved google map javascript to separate js file, updated map template to use base.html
  static file paths, try/except block, javascript cleaned up
  replaced form with html form, upgraded to google maps api v3, added thank you form
  converted edit user form to bootstrap form
  lots of cleanup, replaced urls with reverse and url namespace params, also fixed urls and renamed the video tool file.
  fixed urls