Corrections

26/03/2014
Merge branch 'dev' of https://github.com/firestar300/frotey into dev

Conflicts:
	wp-content/themes/frotey/header.php