Resolve this big pile of shit by manually merge from every branch - Some problems with maven remains