Android Studio boilerplate
Merge branch 'master' of github.com:jsilland/pulsar

Conflicts:
	.gitignore