111
Merge branch 'master' of https://github.com/xmduhan/qi

Conflicts:
	qiandroid/bin/classes/com/qi/mainactivity/MainView$Button1Listener.class
	qiandroid/bin/classes/com/qi/mainactivity/MainView$Button2Listener.class
	qiandroid/bin/classes/com/qi/mainactivity/MainView$Button3Listener.class
	qiandroid/bin/classes/com/qi/mainactivity/MainView$Button4Listener.class
	qiandroid/bin/classes/com/qi/mainactivity/MainView.class