Merge branch 'hotfix/v1.2.1_SP2013-ItemLocator'
Manual update to version for dsp
Added HTML escaping from json serialiser
Merge branch 'hotfix/v1.2.1_SP2013-JSONSerializerEscapeHTML' into develop

Conflicts:
	Source/GSoft.Dynamite.SP/POWERSHELL/Registration/GSoft.Dynamite.Cmdlets.xml