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