wip
Merge branch 'master' of github.com:angelaz/seedb

Conflicts:
	seedb/app/assets/javascripts/contributions.js