Conflicting change.
Merge branch 'master' into SecondBranch

Conflicts:
	Demo/src/anotherPackage/ClassB.java