Closing #70
Merge remote-tracking branch 'origin/master' into fix-issue-63

Conflicts:
	src/main/java/edu/dfci/cccb/mev/configuration/MvcConfiguration.java