Merge pull request #21 from PopShack/develop

Develop
Merge branch 'develop'
Merge pull request #34 from PopShack/develop

Develop
Merge pull request #38 from PopShack/develop

Develop
Merge pull request #43 from PopShack/develop

Develop
Merge pull request #46 from PopShack/develop

Merge
Added a few performance modules
Changed permissions
Added ajax blocks
Merge branch 'develop'
Changed permissions on templates
Added performance module
Merge branch 'master' into develop