Merge branch 'master' of https://github.com/Crashthatch/bathalerts

Conflicts:
	header.php