CSS cleanup
Merged css files
Locked grid system and moved CSS
Merge remote-tracking branch 'origin/master'

Conflicts:
	wordpress/wp-content/themes/scama/footer.php
	wordpress/wp-content/themes/scama/page.php