Initial commit
Merge branch 'master' of https://github.com/madrid-mobile-developers/demo_mixta_android

Conflicts:
	.gitignore