Various content / layout updates from server
Merge branch 'master' of github.com:ConceptMill/aerobatictactics