双语实现，资源文件分开，预约模型异步加载
Merge remote-tracking branch 're/master'

Conflicts:
	sbgl/src/messages_en_US.properties
Merge remote-tracking branch 're/master'
Merge remote-tracking branch 're/master'

Conflicts:
	sbgl/src/messages_en_US.properties
	sbgl/src/messages_zh_CN.properties
Merge remote-tracking branch 're/master'
Merge remote-tracking branch 're/master'
Merge remote-tracking branch 're/master'
Merge remote-tracking branch 're/master'
完成抢占提示接口、作业查看双语
Merge remote-tracking branch 're/master'

Conflicts:
	sbgl/src/com/sbgl/util/CardPassUtil.java