clean up and update of control
Merge branch 'master' of https://github.com/klauskryhlmand/fuerte_workspace