CSS fixes.
Merge branch 'master' of https://github.com/ChillThemes/ChillThemes-Shortcodes

Conflicts:
	css/shortcodes.css