New content field
Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/iowa-house-hotel

Conflicts:
	mysite/code/RoomHolder.php
	themes/ihh/templates/Layout/RoomHolder.ss