Merge origin/master

Conflicts:
	src/test1/Test1.java