GROS PUSH
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	project.properties
	res/values/strings.xml
	src/com/itii/biomarket/BasketFragment.java
	src/com/itii/biomarket/ListStoreActivity.java
	src/com/itii/biomarket/MainActivity.java
	src/com/itii/biomarket/MainSectionsPagerAdapter.java