Merge branch 'master' of http://git.fishlee.net/scm/git/iFish/FSLib.Extension

Conflicts:
	src/FishStringExtension.cs
Merge branch 'master' of http://git.fishlee.net/scm/git/iFish/FSLib.Extension