Code clearning up for the  demo
Merge branch 'master' of https://github.com/wasztemborski/dev
UML init