--- git ignore
Merge branch 'ARI-Android'

Conflicts:
	.gitignore
MADE:
--> Some fixes