Some renames, broken UnitTest is working again
Merge branch 'master' of github.com:icsharpcode/SharpDevelop