Merge branch 'bootstrap'

Conflicts:
	web/bootstrap/index.jsp
Merge remote-tracking branch 'origin/master'