Added a line component, maybe still a little bit unstable at the moment…
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	ide/osx/BaconBox.xcodeproj/project.pbxproj