New initial commit
Merge branch 'tmp' into master1

Conflicts:
	.gitignore
	README.txt
	pom.xml
Delete old files