should be fixed now..
Merge branch 'dev' of https://github.com/piaoasd123/imgd into dev

Conflicts:
	Gnome Engine/Gnome Engine/FEBattleField.cpp
defly should be fixed by now...
Merge branch 'dev' of https://github.com/piaoasd123/imgd into dev