feature -3-change-1
f-5-c-1
f-5-c-2
f-4-c-1
Merge branch 'f-4' into dev

Conflicts:
	src/com/test/git/TestClass.java
Merge branch 'dev' into feature-2

Conflicts:
	src/com/test/git/TestClass.java