Shift to maven
update .gitignore
Switch to maven from branch binck

Conflicts:
	.gitignore