My Pins
My Pins...
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/maurizio/cice/R$drawable.class
	bin/classes/com/maurizio/cice/R$id.class
	bin/classes/com/maurizio/cice/R$layout.class
	bin/classes/com/maurizio/cice/R$menu.class
	bin/classes/com/maurizio/cice/R$string.class
	bin/classes/com/maurizio/cice/R$style.class
	gen/com/maurizio/cice/R.java
Merge branch 'dani'

Conflicts:
	bin/Maurizio.apk
	bin/classes.dex
	bin/classes/com/maurizio/cice/MainActivity.class
	bin/classes/com/maurizio/cice/R$drawable.class
	bin/classes/com/maurizio/cice/R$id.class
	bin/classes/com/maurizio/cice/R$layout.class
	bin/classes/com/maurizio/cice/R$menu.class
	bin/classes/com/maurizio/cice/R$string.class
	bin/classes/com/maurizio/cice/R$style.class
	bin/dexedLibs/android-support-v4-fff578b7ee4ae7f862f6a2d262c5afb3.jar
	bin/dexedLibs/gson-2.2.4-276e9e04aaefabd1a761e0ab0a14eb42.jar
	bin/resources.ap_
	gen/com/maurizio/cice/R.java
	src/com/maurizio/cice/MyPinsFragment.java