initial commit of the student locations feature branch
initial commit of student location
Merge branch 'develop' into feature/student_locations

Conflicts:
	icommons_lti_tools/settings/base.py
	icommons_lti_tools/urls.py
added data to gitignore
Merge branch 'develop' into feature/student_locations

Conflicts:
	icommons_lti_tools/urls.py
changed the default view to lti_launch
Merge branch 'develop' into feature/add_user_tool

* develop:
  added data to gitignore
  initial commit of student location
  initial commit of the student locations feature branch
Merge pull request #1 from Harvard-University-iCommons/develop

Looks good, let's do it
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