About customfields moved out of <p>s + remove unreq'd p class
Merge branch 'master' of https://github.com/copyflake/village-wordpress

Conflicts:
	wp-content/themes/html5reset/page-contact.php
	wp-content/themes/html5reset/page-venue-brs.php
	wp-content/themes/html5reset/page-venue-garden.php
	wp-content/themes/html5reset/page-venue-oh.php
	wp-content/themes/html5reset/page-venue-terrace.php
Merge branch 'master' of https://github.com/copyflake/village-wordpress