Merge branch 'develop' of github.com:LOG4900/Sauce into develop

Conflicts:
	project/Build.scala