mod: build_nr to fit into existing rc
Merge branch 'master' into rc

Conflicts:
	build_nr
mod: rs232 plugin runs
mod: scriptmaster - javascript refresh
fix: rs232terminal and javascript in scriptmaster