Merge pull request #1 from jeffcao/no_payments

fix basic_demo payment
Merge pull request #2 from jeffcao/no_payments

replace umeng app_key
ignore local.properties and project.properties
remove unsupport changes
merge
fix conflict
Merge branch 'edwardzhou-no_payments' into no_payments