the routine for getting annotation collection in json revised.
Merge branch 'working' into development

Conflicts:
	app/helpers/annotations_helper.rb
anncollection spec revised to reflect move of its functin to the annotations controller.
Merge branch 'master' into working
Fixed project.anncollection method