Merge pull request #11 from cnlpete/development

[3.1] Development
Merge pull request #12 from cnlpete/development

fixed the snippets controller