Merge branch 'master' of github.com:prabel/Kawiarnia

Conflicts:
	bin/Kawiarnia.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/com/actionbarsherlock/R$layout.class
	bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$id.class
	bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$layout.class
	bin/classes/pl/studia/kawiarnia/FrontActivity$1.class
	bin/classes/pl/studia/kawiarnia/FrontActivity.class
	bin/classes/pl/studia/kawiarnia/R$id.class
	bin/classes/pl/studia/kawiarnia/R$integer.class
	bin/classes/pl/studia/kawiarnia/R$layout.class
	bin/classes/pl/studia/kawiarnia/R$menu.class
	bin/classes/pl/studia/kawiarnia/R$string.class
	bin/classes/pl/studia/kawiarnia/R$style.class
	bin/classes/pl/studia/kawiarnia/R$styleable.class
	bin/classes/pl/studia/kawiarnia/adapter/ListAdapter.class
	bin/classes/pl/studia/kawiarnia/fragments/HomeFragment.class
	bin/dexedLibs/actionbarsherlock-df6245b0b464903beeeb78346ea91862.jar
	bin/dexedLibs/android-support-v4-f61e59d104443c7697012d07314e93a7.jar
	bin/dexedLibs/aucontentprovider-d763925a2f608413f2599d8cf8ab7464.jar
	bin/dexedLibs/gson-2.2.4-b1276493b53cb36afb1165333f3e9e7d.jar
	bin/dexedLibs/library-bbe8b5229e906ada86728f3b68215509.jar
	bin/resources.ap_
	gen/com/actionbarsherlock/R.java
	gen/com/jeremyfeinstein/slidingmenu/lib/R.java
	gen/pl/studia/kawiarnia/R.java
Added sync with StackMob

Conflicts:
	bin/Kawiarnia.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/com/actionbarsherlock/R$layout.class
	bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$layout.class
	bin/classes/pl/studia/kawiarnia/FrontActivity$1.class
	bin/classes/pl/studia/kawiarnia/FrontActivity.class
	bin/classes/pl/studia/kawiarnia/R$id.class
	bin/classes/pl/studia/kawiarnia/R$integer.class
	bin/classes/pl/studia/kawiarnia/R$layout.class
	bin/classes/pl/studia/kawiarnia/R$menu.class
	bin/classes/pl/studia/kawiarnia/R$string.class
	bin/classes/pl/studia/kawiarnia/R$style.class
	bin/classes/pl/studia/kawiarnia/R$styleable.class
	bin/classes/pl/studia/kawiarnia/adapter/ListAdapter.class
	bin/classes/pl/studia/kawiarnia/fragments/HomeFragment.class
	bin/resources.ap_
	gen/com/actionbarsherlock/R.java
	gen/com/jeremyfeinstein/slidingmenu/lib/R.java
	gen/pl/studia/kawiarnia/R.java
	res/layout/base_store_list_item.xml
	res/layout/dish_fragment.xml
	res/layout/store_fragment.xml
	res/values/strings.xml
	src/pl/studia/kawiarnia/FrontActivity.java
	src/pl/studia/kawiarnia/adapter/ListAdapterStore.java
	src/pl/studia/kawiarnia/fragments/DishFragment.java
	src/pl/studia/kawiarnia/fragments/StoreFragment.java