All subprojects
Add android submodule
Merge branch 'master' into tourapp