Merge branch 'master' of http://git.oschina.net/liyuanfeng/CrossApp into branch_LiYuanFeng
Merge branch 'develop' of http://git.oschina.net/liyuanfeng/CrossApp into branch_LiYuanFeng