Update Portcullis.cfc

Fix typo in onEvent wordFilter value
Making changesetBeans more compatible with MuraORM conventions
Merge pull request #1394 from nsollecito/patch-2

Update Portcullis.cfc
Merge branch 'develop'
Merge branch 'master' of github.com:blueriver/MuraCMS
Manual merge
Manual merge
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'