FUCK THIS
Merge branch 'Erik' of https://github.com/Raful/Hoverboard into Erik

Conflicts:
	Hoverboard/Hoverboard.userprefs
	Hoverboard/Library/CurrentLayout.dwlt
	Hoverboard/Library/assetDatabase3