Fix compile warnings
Merge branch 'master' of github.com:timvdm/Helium

Conflicts:
	src/diagram.cpp