Scrollbars
Merge branch 'master' of https://github.com/tasora/EddyCurrentSeparator

Conflicts:
	source/conveyor_Ida.cpp