Fixed pom.xml(s) to be able to import Kura into Eclipse 4.3 as existing maven projects
Fixed merge conflicts