Integrated webservice communication interface
Integrated webinterface
Integrated webinterface
Merge conflicts resolved
Merge branch 'master' of github.com:SmartCocktailFactory/factorymaster
Fixed merge conflict