adding logo
logo added
refactors some code
Merge branch 'beers_instead_of_stars'
Merge branch 'master' of github.com:jamaga/kataklimb2

Conflicts:
	app/views/places/show.html.erb
	public/system/places/placeimages/000/000/005/original/foixarda.jpg
	public/system/users/userpics/000/000/007/original/twenty-percent-cooler-octocat.png