Merge branch 'dev' into feature/user-profile

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/application/_mixins.css.scss
	app/controllers/relics_controller.rb
	app/views/relics/show/_general.html.haml
	config/routes.rb
	db/schema.rb