Merge branch 'master' into working

Conflicts:
	app/models/project.rb
	app/views/docs/spans.html.erb
	db/schema.rb
Merge branch 'notices' into working

Conflicts:
	db/schema.rb
	lib/shared.rb
Added delayed option in Shared.store_annotations and create notices only when options[:delayed] == true
Merge branch 'working' of https://github.com/pubannotation/pubannotation into working

Conflicts:
	db/schema.rb
Switched test database from sqlite to postgresql
Fixed doc_spec
Fixed instance_spec
Fixed modification_spec
Fixed project_spec
Fixed relation_spec
Fixed annotations_controller_spec
Fixed application_controller_spec
Fixed associate_projects_projects_controller_spec
Fixed divs_controller_spec
Fixed docs_controller_spec
Fixed divs_helper_spec
Fixed detnotations_helper_spec
Fixed application_helper_spec
Fixed view/annotations/index.html.erb_spec.rb
Fixed docs_helper_spec