ProductActivity added
Merge branch 'master' of https://github.com/aberges/EMarket.git

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes/com/example/emarket/LoginActivity.class
	bin/classes/com/example/emarket/R$attr.class
	bin/classes/com/example/emarket/R$dimen.class
	bin/classes/com/example/emarket/R$drawable.class
	bin/classes/com/example/emarket/R$id.class
	bin/classes/com/example/emarket/R$layout.class
	bin/classes/com/example/emarket/R$menu.class
	bin/classes/com/example/emarket/R$string.class
	bin/classes/com/example/emarket/R$style.class
	bin/classes/com/example/emarket/R.class
	gen/com/example/emarket/R.java
	res/menu/product.xml