refactoring for modularity. many regressions.
Merge branch 'master' of github-EDINUNI:blakehawkins/billy-the-silly
progress on regressions and activity hierarchy
strings.xml merge conflicts resolve