Merge pull request #1 from zhanghuan824/master

pull
add tabactivity with two tabs in a tabhost.
this maybe will be replaced with fragmentactivity with tabhost
pull zxing qr code from huan and merge
Merge branch 'master' of https://github.com/huangxuelun/i-waiter