Merge origin/master

Conflicts:
	testJavaApp/src/testjavaapp/AnotherClass.java
changed variable name
finished the merge