- included jplayer and updated css
- removed unnecessary css files
- removed unnecessary template files
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
T
Merge branch 'master' into develop
revised help screen load time
Merge pull request #53 from PopShack/reviseHelpLoad

revised help screen load time
Merge branch 'develop' into removeCustomisation
PopShack Features Updated - Radio
Merge pull request #54 from PopShack/popShackRadioFeature0808

PopShack Features Updated - Radio
included modules due to change of permissions, updated google web fonts from css import to JS in html tpl, adjusted shack sign css, updated popshack features
Merge pull request #55 from PopShack/correctedcssForShack

included modules due to change of permissions, updated google web fonts ...
inclusion of popshack revised home page and json2 libraby
Merge pull request #56 from PopShack/revisedHomeboxToPanel

inclusion of popshack revised home page and json2 libraby
Merge pull request #57 from PopShack/develop

Merge develop into master