A lot of stuff
Merge branch 'master' of https://github.com/KiwiMusic/KiwiCore

Conflicts:
	KiwiBase/Box.cpp