Column Left Revisions
Merge remote-tracking branch 'origin/master'

Conflicts:
	includes/column_left.php
	templates/cShop/style.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	includes/column_left.php
Login Page Design Update
Merge remote-tracking branch 'origin/master'