Fix project setup
Push sub-projects
Merge branch 'master' into tourapp