Merge javamaster/master

Conflicts:
	README.md
Merge origin/development into development

Conflicts:
	.gitignore