cartactivity
Merge remote-tracking branch 'origin/master'

Conflicts:
	TAPtoBUY/src/com/gui/taptobuy/activity/SearchActivity.java
	TAPtoBUY/src/com/gui/taptobuy/datatask/Main.java
merge fix
Fix ProductInfo for sale y bid