Merge branch 'master' of github.com:robccarey/SkyWarehouseApp

Conflicts:
	res/layout/main.xml
	src/com/sky/bootcamp/SkyWarehouseApp/Home.java