Merge pull request #1 from stevenirby/develop

Develop
Merge pull request #2 from stevenirby/master

added userena stuff