adding comments to annotations, and fixing test cases for annotations
Merge branch 'master' of https://github.com/IDE4edu/isa-curriculum.git

Conflicts:
	trunk/curriculum/lib/src/edu/berkeley/eduride/EduRideTest.java