Merge branch 'master' into despora

Conflicts:
	Gemfile.lock
	README.md
	app/models/user.rb
	app/views/layouts/_header.html.haml
	app/views/shared/_donatepod.html.haml
	app/views/shared/_links.haml