Update
Merge branch 'master' of https://github.com/fabianz66/Hackathon

Conflicts:

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/NewsActivity
.class

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/accesodatos/
AccesoDatosUsuarios.class
	BYND2015Hackathon/src/com/gotouch/bynd2015hackathon/NewsActivity.java