ultimo de la interface
Merge remote-tracking branch 'origin/master' into temp

Conflicts:
	TAPtoBUY/src/com/gui/taptobuy/activity/SearchActivity.java
merge fix