Upgrade jQuery
Merge branch 'develop' of https://github.com/SciMed/status-board into develop

Conflicts:
	Gemfile.lock