Merge branch 'master' of github.com:carsongross/oppfinder

Conflicts:
	pom.xml
	src/main/gosu/controller/DataSetController.gs
	src/main/gosu/jobs/DataUploadJob.gs
	src/main/gosu/jobs/RecommendJob.gs
	src/main/gosu/model/DataSetInfo.gs
Merge branch 'master' of github.com:carsongross/oppfinder