controller fixed
Merge branch 'dev' of github.com:donkeysharp/whiteboard into dev