mvn eclipse:eclipse will now add src/main/scala
correctly adding scala nature and test classes when mvn eclipse:eclipse is used
Merge remote-tracking branch 'remotes/devender/master'

Conflicts:
	pom.xml