Merge branch 'master' of https://github.com/tararoys/SurveyDBC
merged
Merge branch 'master' into TLR-KJF/Survey-takers-section

Fixed merge conflict in application.js.
Deleted spare logout button.

Conflicts:
	public/js/application.js