Merge branch 'working_old' into working

Conflicts:
	app/views/docs/_content.html.erb
	db/schema.rb
Merge branch 'working' of https://github.com/pubannotation/pubannotation into working

Conflicts:
	app/views/docs/spans.html.erb
after merge
Merge branch 'working' into development