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

Conflicts:

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

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

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/R$drawable.c
lass
	BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/R$id.class

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

BYND2015Hackathon/bin/classes/com/gotouch/bynd2015hackathon/R$menu.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/N
ewsActivity.class

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