Update to repo and gitignore
Merge branch 'develop' of github.com:epgmedia/beveragedynamics into develop