Merge branch 'master' of https://github.com/BodaciousMike/PLApp

Conflicts:
staging/json_appdata.txt
staging/pla_style.css