First cut for new login flow
Merge branch 'master' of https://github.com/tungpham31/LUBarcode

Conflicts:
	src/com/beautifullab/lubarcode/pebble/PebbleManager.java
	src/com/beautifullab/lubarcode/qr/ZXingCodeGenerator.java
Fix merge conflicts