Merge branch 'master' of https://github.com/blueyeco/bc3

Conflicts:
	header.php
additonal homepage changes.