change what is marked as blue and red; perform report for button
Merge branch 'master' of github.com:ramigg/arvut_system

Conflicts:
	Gemfile
	app/cells/tags_widget/display.html.erb
	app/models/user.rb