sadas
Merge remote-tracking branch 'grobert2/master'

Conflicts:
	src/test/java/VeryMeaningfulClassTest.java