kj
Myhistory
Merge remote-tracking branch 'origin/master'

Conflicts:
	TAPtoBUY/src/com/gui/taptobuy/activity/CartActivity.java
	TAPtoBUY/src/com/gui/taptobuy/activity/MyBiddingActivity.java
	TAPtoBUY/src/com/gui/taptobuy/customadapter/BiddingsCustomListAdapter.java
	TAPtoBUY/src/com/gui/taptobuy/customadapter/CartCustomListAdapter.java