partial implementation of wallet
Merge branch 'master' into wallet-genesis
Merge branch 'master' into wallet-genesis
added ignore for wallet secrets
adding angular controllers to booking.html
Merge branch 'master' into wallet-genesis
partial completion of payments controller
fixed merge conflicts
fixed merge conflict
implemented purchase with google wallet
fixed merge conflicts: wallet-genesis -> master
fixed merge conflicts
added busy state to booking