Merge branch 'dev-branch' of github.com:mastacontrola/fogproject into dev-branch
Merge master with dev-branch