merged selected files for example project from dev branch
Merge branch 'master' of github.com:lookup/Splango