12 ->14
Merge branch 'feature/fancy_qr_code' of https://github.com/bither/bither-android into feature/fancy_qr_code