Merge branch 'Front-End'
Added 'intelligent' date and location
conflict resolution

Conflicts:
	wp-content/themes/hb/includes/header.php
	wp-content/themes/hb/index.php
removed HEAD
Merge branch 'master' into Front-End