test git (a)
Merge remote-tracking branch 'origin/master'

Conflicts:
	libmgr/src/com/for2nice/libmgr/Main.java