upgrade to scala 2.10.0-RC2.  changed maven scala plugin
Merge remote-tracking branch 'remotes/dr3s/master'

Conflicts:
	pom.xml