Initial commit
Merge branch 'master' of github.com:stasyanx/demo_app into locale