Project base : maven module, config files, some empty classes
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml