...
Merge branch 'master' of https://github.com/KiwiMusic/KiwiView

Conflicts:
	Source/jBoxController.cpp
	Source/jBoxController.h
	Source/jLinkController.cpp
	Source/jPageController.cpp
	Source/jPageController.h