+commit calculator
Merge branch 'master' of https://github.com/corso-mobile-dev/mayanana.git

Conflicts:
	CleanCalculator
	findmypet/bin/classes.dex
	findmypet/bin/findmypet.apk
	findmypet/bin/res/crunch/drawable-hdpi/ic_launcher.png
	findmypet/bin/res/crunch/drawable-mdpi/ic_launcher.png
	findmypet/bin/res/crunch/drawable-xhdpi/ic_launcher.png
	findmypet/bin/res/crunch/drawable-xxhdpi/ic_launcher.png
	findmypet/bin/resources.ap_
	findmypet/res/layout/activity_home.xml
Merge branch 'master' of https://github.com/corso-mobile-dev/mayanana

Conflicts:
	CleanCalculator