Merge branch 'feature-noshow' into development

Conflicts:
	lib/morris.line.coffee