565656
Merge branch 'master' of https://github.com/aixiaoxianggithub/bigdo.git

Conflicts:
	project.properties
	src/com/bigdo/app/Video_Pay_Activity.java