Merge branch 'dev'
entrust setup
Merge branch 'master' of https://github.com/jemnuine/pupsraa-cms
Merge pull request #37 from jemnuine/dev

entrust setup