Merge origin/master

Conflicts:
	src/gittestproject2/GitTestProject2.java