Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/MyTestClass.java
Merge remote-tracking branch 'origin/master'