add maven build support
Merge branch 'maven'

Conflicts:
	.project