modified:   com/holding/smile/activity/BaseActivity.java
	modified:   com/holding/smile/myview/MyLinearLayout.java
	deleted:    ../keystore
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/keystore