android build
split android / iphone versions
fix
Merge branch 'master' of github.com:fila61gmail/FIELDMARSHAL

Conflicts:
	.gitignore