Updated 1.5 legacy code before rewrite
Merge remote-tracking branch 'origin/master'

Conflicts:
	Views/Home/Jeopardy.html
	app.js
	public/JS/ViewModels/JeopardyViewModelNew.js
	public/Stylesheets/Views/AnswerStyles.less