IN PROGRESS: http://developer.raikes-ds.com/jira/browse/PRTLP-65
Merge branch 'develop' of https://github.com/icotting/Phocalstream into develop

Conflicts:
	Phocalstream_Shared/Phocalstream_Shared.csproj
IN PROGRESS: http://developer.raikes-ds.com/jira/browse/PRTLP-65