Updates and bug fixes
Merge branch 'Development' of https://github.com/Ormbzzzy/gracek_apk
into Development

Conflicts:
	MIA/AndroidManifest.xml
	MIA/res/layout/add_discount_product.xml