bugfix for the snippets plugin as it would 'steal' the smarty directory, that was previously set
Merge pull request #7 from cnlpete/release/3.0

bugfix for the snippets plugin
Merge pull request #9 from marcoraddatz/master

3.0 -> 3.1
fixed all cache paths
Merge branch 'master' of github.com:marcoraddatz/candyCMS-Plugins
improved cache paths
fixed cache issues
Merge remote-tracking branch 'marcoraddatz/3.1' into development

Conflicts:
	Snippets/Snippets.controller.php
Merge remote-tracking branch 'marcoraddatz/master' into development

Conflicts:
	AddThis/AddThis.controller.php
	Analytics/Analytics.controller.php
	Disqus/Disqus.controller.php
	FacebookCMS/FacebookCMS.controller.php
	FormatTimestamp/FormatTimestamp.controller.php
	Headlines/Headlines.controller.php
	LanguageChooser/LanguageChooser.controller.php
	Piwik/Piwik.controller.php
	SocialSharePrivacy/SocialSharePrivacy.controller.php
	TagCloud/TagCloud.controller.php
	TinyMCE/TinyMCE.controller.php