Merge branch 'master' of github.com:amberbit/KarmaTracker

Conflicts:
	app/assets/stylesheets/application.scss
Merge branch 'feature/52973405_delay_on_searches'