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

Conflicts:

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

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