remove commented out styles from css files
removed unnecessary comments and commented out code from templates
Merge branch 'develop'