Merge pull request #4 from PopShack/develop

Develop
Merge pull request #8 from PopShack/develop

Develop
Merge pull request #17 from PopShack/develop

Develop
Fixing build
Merge branch 'exportContent' into stable
Merge branch 'stable'
Merge branch 'master' into develop