merged
Merge branch 'master' of github.com:openpizza/openpizza-android
Merge branch 'master' of github.com:openpizza/openpizza-android