Some changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	contact/index.php
	css/contact.css