Merge pull request #156 from Firesphere/master

Ensure templateName is a valid value

Merge pull request #155 from jareddreyerss/feature/cms-5-upgrade

removal of beta tag for cms 5 support

merge changes from branch 3

Merge branch '2' into 3.0

Merge pull request #153 from creative-commoners/pulls/2.2/fix-trace

FIX Identify correct class/method for query trace

fix requirements being called too early

faster backtrace

add note about jquery inclusion during action