q
Merge branch 'master' of https://github.com/Hanyken/AdroidShopClient

Conflicts:
	workspace/.metadata/.plugins/org.eclipse.cdt.core/.log
	workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	workspace/.metadata/.plugins/org.eclipse.jdt.core/942809604.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt