Merge branch 'dev' into staging

Conflicts:
	css/bootstrap.css
	css/bootstrap.min.css
	index.html
	js/bootstrap.js
	js/bootstrap.min.js
Merge branch 'staging'

Conflicts:
	css/bootstrap.css
	css/bootstrap.min.css
	index.html
	js/bootstrap.js
	js/bootstrap.min.js