πππ
Merge remote-tracking branch 'origin/master'

Conflicts:
	Order@Samos/AndroidManifest.xml
	Order@Samos/bin/AndroidManifest.xml
	Order@Samos/bin/Order At Samos.apk
	Order@Samos/bin/OrderAtSamos.apk
	Order@Samos/bin/R.txt
	Order@Samos/bin/classes.dex
	Order@Samos/bin/classes/com/facebook/android/R$id.class
	Order@Samos/bin/classes/com/socialize/R$id.class
	Order@Samos/bin/classes/com/tardis/ordersamos/CurlActivity.class
	Order@Samos/bin/classes/com/tardis/ordersamos/Estiatoria.class
	Order@Samos/bin/classes/com/tardis/ordersamos/EstiatoriaPopup.class

	Order@Samos/bin/classes/com/tardis/ordersamos/ExpandableListAdapter.class
	Order@Samos/bin/classes/com/tardis/ordersamos/MainMenu.class
	Order@Samos/bin/classes/com/tardis/ordersamos/R$id.class
	Order@Samos/bin/classes/com/tardis/ordersamos/R$layout.class
	Order@Samos/bin/classes/com/tardis/ordersamos/R$menu.class
	Order@Samos/bin/classes/com/tardis/ordersamos/R$string.class
	Order@Samos/bin/classes/com/tardis/ordersamos/R$style.class
	Order@Samos/bin/classes/com/tardis/ordersamos/R$styleable.class
	Order@Samos/bin/classes/com/tardis/ordersamos/R$xml.class
	Order@Samos/bin/classes/com/tardis/ordersamos/Ratings.class
	Order@Samos/bin/classes/com/tardis/ordersamos/Splash.class

	Order@Samos/bin/dexedLibs/android-ioc-17b76396a440de9f2c8d32104411072c.jar

	Order@Samos/bin/dexedLibs/android-support-v4-5399d61a1f5f122e80c8a1a4d76baace.jar

	Order@Samos/bin/dexedLibs/annotations-5fb1bb4ddf0fd0a9f2c4b98bd64a1527.jar

	Order@Samos/bin/dexedLibs/annotations-ca7aae36e424e8bfeaeb652b0d988590.jar

	Order@Samos/bin/dexedLibs/commons-codec-1.4-1aa4f8a8dc4f0a653d61f8919088061c.jar

	Order@Samos/bin/dexedLibs/facebooksdk-c3c92f8ddc001bf93eff861a2ed0049e.jar
	Order@Samos/bin/dexedLibs/sdk-e54408e5dd9d237992dbabbf8ff324df.jar
	Order@Samos/bin/resources.ap_
	Order@Samos/gen/com/facebook/android/R.java
	Order@Samos/gen/com/socialize/R.java
	Order@Samos/gen/com/tardis/ordersamos/R.java
	Order@Samos/res/layout/activity_info.xml
	Order@Samos/res/layout/activity_katigories.xml
	Order@Samos/res/layout/activity_main_menu.xml
	Order@Samos/res/layout/activity_ratings.xml
	Order@Samos/res/values/strings.xml
	Order@Samos/src/com/tardis/ordersamos/Estiatoria.java