[#158]add block editor for choice between single and multi line text in the inpu
t brick and give the input brick the ability to choose between these two
[#218]change label of colorpicker according to mockups
Merge branch 'master' of github.com:InTradeSysTeam/webmaker-app

Conflicts:
	blocks/input/index.html
	blocks/input/index.js
[#197]move methods into methods object and remove brackets
correct attribute names, remove unnecessary html attributes, add skipAutoRender to the attributes and correct colors in stylesheet
[#218]change vue event to on-change to stop strange bug when entering text