a start - once again
moving function
Merge commit 'a71705' into testing

Conflicts:
	src/controller/Controller.cpp
Scripts
1
Lalala
Fixed some issues
bl
h
It works ;-)
hhhhhhhhh
Merge branch 'master' into testing