merge errors 2
Merge branch 'android-stub' of https://github.com/stestaub/drallo-app into android-stub