Merge master into GavinUpdate

Conflicts:
	web/index.jsp
Revert "Index.jsp replaced with bootstrap html, css, img and js folders added from new HTML5 project."

This reverts commit db56e2108be56fa8811d059975dcd1a77d0a73d8.
Merge master into GavinUpdate

Conflicts:
	web/index.jsp