Fixes for decorated classes in the Evaluater
Merge branch 'master' of github.com:mrolufs/speed-ios

Conflicts:
	ProfileDesign.xcodeproj/project.pbxproj