doing contactus
removed conflicts

Merge branch 'master' of https://github.com/iamtopnwk/Eshop.git

Conflicts:
	Eshop/AndroidManifest.xml
	Eshop/res/values/strings.xml