Merge branch 'android-dev'
 - removed binaries and excluded them in the git ignore file
Merge branch 'master' into android-dev

Conflicts:
	.gitignore