gitingore update res/matrices
Ant & test script udpate
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore