set text=auto to normalize linefeeds
Added pom.xml created by Kerby Martino

I couldn't pull his branch because there were unnecessary changes to files. Propably because of different linefeeds.
Mavenized
..
Simplified
Simplified
Merge origin/master