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
Merge pull request #50 from PopShack/jPlayerRadio

- included jplayer and updated css
removed background module and added static background
Merge pull request #51 from PopShack/removeCustomisation

removed background module and added static background
updated javascript to extend timer to 16s from 12s, as per VM request
Merge pull request #52 from PopShack/updateHelpScreen

updated javascript to extend timer to 16s from 12s, as per VM request
Added performance module
T
Merge branch 'master' into develop