set up android project
Merge branch 'master' into dev

Conflicts:
	.gitignore