Merge branch 'develop' into feature/miscellaneous

Conflicts:
	ab_tool/templates/ab_tool/control_panel.html
Merge branch 'develop' into feature/miscellaneous

Conflicts:
	ab_tool/analytics.py
adds initial database migration to ab_tool and django_canvas_oauth
Merge pull request #102 from penzance/feature/db_migration

adds initial database migration to ab_tool and django_canvas_oauth
Merge branch 'feature/miscellaneous' into develop

Conflicts:
	ab_tool/analytics.py
Merge branch 'develop' into feature/delete_experiment_button