Merge remote-tracking branch 'origin/master'

Conflicts:
	css/Default_en-us.css
	css/Responsive_en-us.css
	header.php
	index.php