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

Conflicts:
	Phocalstream_Web/Application/Data/DroughtMonitorRepository.cs