Merge remote-tracking branch 'origin/develop'

Conflicts:
	Plugin-ElectricalConductivity/ElectricalConductivity.htm
	Plugin-ElectricalConductivity/ElectricalConductivity.js
	Plugin-ElectricalConductivity/ElectricalConductivity.min.js
	Plugin-ElectricalConductivity/Properties/AssemblyInfo.cs
	Plugin-Relays/Relays.cs
	Plugin-Temperature/Temperature.cs
Merge branch 'master' of github.com:h07r0d/Netduino-Aquarium-Controller

Conflicts:
	Plugin-ElectricalConductivity/Plugin-ElectricalConductivity.csproj