Draws + updates + qualifies (same section)
Merge branch 'master' of https://github.com/MySmallfish/SAMS

Conflicts:
	src/Data/Sams.edmx.diagram