增加方法onstop
Merge branch 'master' of https://github.com/wanglibank/loneswordman

Conflicts:
	Demo/bin/classes/com/example/demo/MainActivity.class