add https (no complete)
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/src/com/holding/smile/activity/MainActivity.java
login (no complete)
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/res/values/strings.xml
	smile_android/src/com/holding/smile/activity/MainActivity.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
修改了用户自动登录接口和退出接口，参数userid改为username
login complete