pulled from server - 27/08/14
Merge remote-tracking branch 'origin/master'

Conflicts:
	about.php
	blog.php
	css/xFitStyle.css
	fitness.php
	header.php
	index.php
	js/myScripts.js
	landing.php
	mail/mailHandler.php
Hope for fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	FAQ.php
	blog.php
	contactus.php
	fitness.php