improved data gathering and constants in main
Merge branch 'master' of https://github.com/bobbyziom/AquaControl

Conflicts:
	AquaControl/Widgets/Base/WidgetConstruct.cs
	AquaControl/Widgets/Graph.cs