second commit changes in database
Merge https://github.com/Akki2200/Inventerium

Conflicts:
	.classpath
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/Inventerium.apk
	bin/classes.dex
	bin/classes/com/horizzon/inventerium/Brand.class
	bin/classes/com/horizzon/inventerium/Distributor.class
	bin/classes/com/horizzon/inventerium/ImageLoader$BitmapDisplayer.class
	bin/classes/com/horizzon/inventerium/ImageLoader.class
	bin/classes/com/horizzon/inventerium/InsertProduct$1.class
	bin/classes/com/horizzon/inventerium/InsertProduct$DownloadXML.class
	bin/classes/com/horizzon/inventerium/InsertProduct.class
	bin/classes/com/horizzon/inventerium/ListViewAdapter.class
	bin/classes/com/horizzon/inventerium/Login_page$1.class
	bin/classes/com/horizzon/inventerium/Login_page.class
	bin/classes/com/horizzon/inventerium/PlaceOrder.class
	bin/classes/com/horizzon/inventerium/Product$DownloadXML.class
	bin/classes/com/horizzon/inventerium/Product.class
	bin/classes/com/horizzon/inventerium/Progress_bar$1.class
	bin/classes/com/horizzon/inventerium/Progress_bar.class
	bin/classes/com/horizzon/inventerium/R$drawable.class
	bin/classes/com/horizzon/inventerium/R$id.class
	bin/classes/com/horizzon/inventerium/R$layout.class
	bin/classes/com/horizzon/inventerium/R$menu.class
	bin/classes/com/horizzon/inventerium/R$string.class
	bin/classes/com/horizzon/inventerium/R$style.class
	bin/classes/com/horizzon/inventerium/Shopkeeper.class
	bin/classes/com/horizzon/inventerium/SingleItemView$DownloadXML.class
	bin/classes/com/horizzon/inventerium/SingleItemView.class
	bin/dexedLibs/android-support-v4-61469bbb69d36e94b745000c81e3580d.jar
	bin/resources.ap_
	gen/com/horizzon/inventerium/R.java
	res/layout/activity_login_page.xml
	res/layout/activity_progress_bar.xml
	res/values/strings.xml
	src/com/horizzon/inventerium/Distributor.java
	src/com/horizzon/inventerium/InsertProduct.java
	src/com/horizzon/inventerium/Login_page.java
	src/com/horizzon/inventerium/PlaceOrder.java
	src/com/horizzon/inventerium/Product.java
	src/com/horizzon/inventerium/Progress_bar.java
	src/com/horizzon/inventerium/Shopkeeper.java