commit as3 version
Add version 1 and version 2 test image files
Merge remote-tracking branch 'eweidaw/master'
Merge remote-tracking branch 'tarotarorg/master'

Conflicts:
	.gitignore