add flotr2 graph
Merge branch 'master' of github.com:fandrews/SalumiUI

Conflicts:
	.idea/workspace.xml