Changing the display name of 'text box' to note (Bug #1339113)

So as to seperate the 'text' block from the 'note' block

I figured just changing the viewable text from 'text box' to 'note' will
be fine as we have in another occasion changed blog to journal but
still have the info in the db recorded as blog.

I've also replaced the hardcoded 'textbox/note' block option to with
the new 'text' block option at top of chooser list.

And forced the site upgrade to install this new 'text' block.

Change-Id: Ib40815cc359fc0d4eb715009e506f5fd3e36ee57
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
Merge "Changing the display name of 'text box' to note (Bug #1339113)"