f-7-c-1
f-7-c-2
Merge branch 'dev'

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