made maven project with build routines
Merge branch 'maven-project'

Conflicts:
	.gitignore
	.gitmodules