完成第三方登录操作，控件样式需要子为优化
Merge branch 'dev' of github.com:Java3-2/Card-English into dev

Conflicts:
	CardEnglish/bin/classes/com/java3_2/cardengilsh/R$id.class
	CardEnglish/bin/jarlist.cache
	CardEnglish/gen/com/java3_2/cardengilsh/R.java
	CardEnglish/res/layout/activity_start_text.xml