Merge branch 'master' of https://github.com/ConnectThink/WP-SCSS

Conflicts:
	cache/test.css
Merge branch 'master' of https://github.com/ConnectThink/WP-SCSS