se refactorizan clases y se agrega javadoc
Merge branch 'master' of ssh://git@github.com/DevelopmentTesis/src.git

Conflicts:
	HotOffer/bin/HotOffer.apk
	HotOffer/bin/classes.dex
	HotOffer/bin/resources.ap_