cleaned up merge with Trinity
re-add Flask of the North and Flask of Enhancement patch
re-add gameobject flags 4 fix (original patch by FireEmerald)