Merge github.com:neurotic/hba_theme

Conflicts:
	css/global.css
	css/hba-theme-alpha-default.css
	hba_theme.info
	template.php
	templates/node--biblio-hbw.tpl.php