本地修改ui
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/main_activity.xml
	res/values/strings.xml
	src/com/qihoo/unlock/MainActivity.java
完善功能和界面