Merge branch 'Sphinx'

Conflicts:
	Gemfile
	Gemfile.lock
	README.md
	config/routes.rb