Android studio bare project
Merge branch 'master' of github.com:ascariandrea/androidBareGradle

Conflicts:
	.gitignore