Merge branch 'bootstrap'

Conflicts:
	web/bootstrap/index.jsp
Merge branch 'bootstrap'

Conflicts:
	web/bootstrap/index.jsp
Merge branch 'bootstrap'

Conflicts:
	web/bootstrap/index.jsp
Merge branch 'bootstrap'

Conflicts:
	web/bootstrap/index.jsp