Format code and renames
Merge branch 'develop' of github.com:dragibus-4if/dragibus-devoo into develop