Merge branch 'master' into services
updated python app creation
Merge branch 'services'