Merge branch 'master' of git://github.com/dcaoyuan/nbscala

Conflicts:
	scala.editor/src/main/resources/org/netbeans/modules/scala/editor/resources/layer.xml
Merge branch 'master' of github.com:rcano/nbscala

Conflicts:
	scala.editor/src/main/resources/org/netbeans/modules/scala/editor/resources/layer.xml