Fixed footer and header to work with newly-added Boostrap.
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	header.php