Continuing development using demoapp instead of osmdroidtests

I've been preparing the public demo app in the demoapp branch of the repo. Since this app will be public and contains more and better polished features than the "osmdroidtests" app we were using before, I'm setting this as our default test app and merging the branch.