fixed some stuff
Merge branch 'master' of https://github.com/Slokken/Risseproto

Conflicts:
	Risseproto/Risseproto/Controller.cs
hmm