general styling
Merge branch 'develop' of https://github.com/basekit-templates/oceanhotel into develop

Conflicts:
	metadata.json
general styling
line height styling
header styling
feature and company name styling
footer styling
feature button styling
nav and header fixes
nav fixes
iphone nav fixes
nav fixes for iphone
padding of a nav