Android build
Merge branch 'master' of https://github.com/smalljimmy/travelmate.git
3d markers and style sheet adjustments