rename smartinput.js to input.js,  custom input template
Merge remote-tracking branch 'origin/develop' into develop