* Fixed emailDao
Merge branch 'develop' of https://github.com/russ4stall/coffee-machine into develop