ok
merged pom file
Merge branch 'temp'
manually readded stuff fromdetached head