modified client controller
Merge branch 'htw' of github.com:Docear/Desktop into htw