Refactoring code style
Merge branch 'develop' of https://github.com/fogbow/fogbow-manager.git
into develop