dynamically generated charts
Merge branch 'master' of https://github.com/Ermlab/silos

Conflicts:
	Api/Example/Example/Example.pidb
	Api/Example/Example/Program.cs
	Api/Example/Example/bin/Debug/Example.exe
	Api/Example/Example/bin/Debug/Example.exe.mdb
	client/views/logs/showLogs.js