Merge pull request #8 from PopShack/develop

Develop
Merge pull request #17 from PopShack/develop

Develop
Merge pull request #19 from PopShack/exportContent

Export content modules
Merge branch 'stable'
Merge branch 'master' into develop
Added strongarm
Merge pull request #20 from PopShack/strongArm

Added strongarm
Merge pull request #21 from PopShack/develop

Develop
Merge pull request #18 from PopShack/master

Master to stable