莎莎的界面 半成品
new UI before pull
倒逆之蝶
新界面
Merge branch 'test' of https://github.com/chntujia/Asteriated_Grail into test
Merge branch 'test' of https://github.com/chntujia/Asteriated_Grail into test
Merge branch 'test' of https://github.com/chntujia/Asteriated_Grail into test

Conflicts:
	gui/widget/RoleItem.cpp
bp
倒逆修改倒回。。。
增加按钮 游戏结束图片
Merge branch 'test' of https://github.com/chntujia/Asteriated_Grail into test
新界面部分修正，4人局
Merge branch 'test' of https://github.com/chntujia/Asteriated_Grail into test
Merge from v1.4

conflict真但疼系列
修正乱入的gbk字符串

砍掉了几个warning