update remote
Merge branch 'master' of https://github.com/manassorn/shopbox.git

Conflicts:
	ShopBox/gen/com/manassorn/shopbox/R.java
	ShopBox/src/com/manassorn/shopbox/MainActivity.java