Merge origin/master

Conflicts:
	src/TestClass.java
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	src/TestClass.java