Conflict correction in CommandManager.java
Merge branch 'master' of git@github.com:Faustyachka/Zephyrus.git
Creation of Cable, getting all the Cable types from the DB, workflow
page.