First commit
Merge branch 'master' of https://github.com/platzhersh/hackzurich14-scandit-android-app