maven merge
Merge branch 'maven' into dev

Conflicts:
	bin/.gitignore