Merge branch 'develop' into staging to use Bootstrap.

Conflicts:
	index.html