Con evento de Eventos
Merge branch 'master' of https://github.com/fabianz66/Hackathon

Conflicts:
	BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/R$id.class

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/R$string.cla
ss

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/R$style.clas
s

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/activities/L
oginActivity$UserLoginTask.class

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/activities/L
oginActivity.class

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/activities/R
egisterActivity.class

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/utils/NewsAd
apter.class
	BYND2015Hackathon/gen/com/gotouch/bynd2015hackathon/R.java