work in progress
Merge branch 'master' into awards_work

Conflicts:
	Gemfile.lock
voting tables