Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/patrickjoly/3dzer

Conflicts:
	dddzer-1.0.0-SNAPSHOT.log