Big fixes and combining section
Merge branch 'master' of github.com:thelasource/source-new

Conflicts:
	header.php