Project Aria
Create new Android project
Merge branch 'master' of github.com:agentwaj/Aria

Conflicts:
	.gitignore