Skip maven target/ folder
Set up jar mainClass
Merge branch 'master' into tunnel

Conflicts:
	pom.xml
Pom changes merge
Changed project source level to 1.7