Add subprojects
Add subprojects
Fix git scripts
Merge branch 'master' into tourapp
Fix git scripts