Update app.
Merge branch 'master' of https://github.com/jescudero/Maria

Conflicts:
	.DS_Store