latest codenvy changes
Appcontroller problems?
changes on ListController and Parent.fxml
solved merge conflicts