finishing stuff as much as possible ahead of the board meeting
Merge https://github.com/adster101/French-Connections-

Conflicts:
	administrator/components/com_helloworld/controllers/propertyversions.php
	components/com_accommodation/models/listing.php