We meet again.
Merge branch 'master' of https://github.com/Raful/Hoverboard into Erik

Conflicts:
	Hoverboard/Hoverboard.userprefs