Allow update of object
Merge branch 'master' of https://github.com/jescudero/Maria

Conflicts:
	.DS_Store
	Maria/ViewControllers/Main.storyboard