Nodescala all
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/lib_managed.xml