merge
Merge branch 'master' of https://github.com/svshane/skyneat.git

Conflicts:
	com.svtest.git/src/com/svtest/git/myclass.java