3.1.0 dev

merge latest code, including textbox control