new dashboard, backgrounds and image buttons.
user login on main activity
Merge remote-tracking branch 'origin/test'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/OSIA.apk
	bin/classes.dex
	bin/classes/com/cse470/osia/DashBoardActivity.class
	bin/classes/com/cse470/osia/DatabaseHandler.class
	bin/classes/com/cse470/osia/ProductAdapter.class
	bin/classes/com/cse470/osia/R$id.class
	bin/classes/com/cse470/osia/R$layout.class
	bin/classes/com/cse470/osia/R$menu.class
	bin/classes/com/cse470/osia/R$string.class
	bin/classes/com/cse470/osia/R$style.class
	bin/classes/com/cse470/osia/SalesOrder$1$1.class
	bin/classes/com/cse470/osia/SalesOrder$1.class
	bin/classes/com/cse470/osia/SalesOrder$2.class
	bin/classes/com/cse470/osia/SalesOrder$3.class
	bin/classes/com/cse470/osia/SalesOrder.class
	bin/classes/com/cse470/osia/SalesOrderAddItem.class
	bin/classes/com/cse470/osia/SalesProductAdapter.class
	bin/classes/com/cse470/osia/ViewInventory.class
	bin/resources.ap_
	gen/com/cse470/osia/R.java
	res/values/strings.xml
	src/com/cse470/osia/DashBoardActivity.java
	src/com/cse470/osia/DatabaseHandler.java
	src/com/cse470/osia/SalesOrder.java