fix bug #1 我的草稿
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/im/taoatao/o2o/MyApplication.java