Merge remote-tracking branch 'mike/master'
cleaning
Merge remote-tracking branch 'mike/master'
fixed textbox moving