Merge branch 'master'
int for Y in case of Round-N, semi-hack
Scalar math prop types, settable
Further work, upgrade old layout
Bugfixes, upgrades, label etc.
Merge pull request #317 from nortikin/scalar-label

Scalar+label
bump scalar math update
Merge branch 'development'

Conflicts:
	nodes/number/scalar.py
	utils/version
Resolved conflict