Merge branch 'working_old' into working

Conflicts:
	app/views/docs/_content.html.erb
	db/schema.rb