Fixed Scala Setup makefile
Merge branch 'master' of github.com:richnou/odfi-scala

Conflicts:
	external/Makefile