modify: background
version: 1.2.1
Merge branch 'master' of git@github.com:wangyq/AuthBuptGw.git

Conflicts:
	AuthBuptGw/gen/com/bnrc/authbuptgw/R.java