Merge branch 'master' into staging

Conflicts:
	app/assets/stylesheets/application/profile.css.scss
	app/controllers/api/v1/relics_controller.rb
	app/models/search.rb
Merge branch 'feature/relics-profile' into staging
Merge branch 'feature/slider' into staging