Side bar - Paris
Side bar - ALL CITY
All friends events + Paris description french
neukolln secret event
Merge branch 'Robin' fixed conflicts

Conflicts:
	new-york.html
	paris.html