[Trunk] fixed cpBenignIfAdded (was broken by introduction of code to support context specific ConflictPriority)

git-svn-id: http://skyrim-plugin-decoding-project.googlecode.com/svn@1695 bdfc8fb3-84cf-a68a-e902-ed0415cf5604
[Trunk] fix behaviour for pcNormalIgnoreEmpty so that the left-most non-empty column is considered the master, instead of always the absolute left-most one.

git-svn-id: http://skyrim-plugin-decoding-project.googlecode.com/svn@1696 bdfc8fb3-84cf-a68a-e902-ed0415cf5604
[Trunk] fix for TwbContainer.RemoveElement calling InvalidateParentStorage instead of InvalidateStorage

git-svn-id: http://skyrim-plugin-decoding-project.googlecode.com/svn@1697 bdfc8fb3-84cf-a68a-e902-ed0415cf5604
Merge branch 'master' of https://github.com/TES5Edit/TES5Edit-GoogleCode