Various
Merge branch 'master' of https://github.com/Tranquility/studentsonrails-weihnachtsmann

Conflicts:
	app/views/wishlists/show.html.erb