Index.jsp replaced with bootstrap html, css, img and js folders added from new HTML5 project.
Merge master into GavinUpdate

Conflicts:
	web/index.jsp