code cleanup / bugfix
Merge branch 'master' of https://github.com/hammd1/ch.bfh.bti7054.w2013.p.mywineguide.git