test6
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/diosoft/impl/ArrayHelper.java