popups v2
popups v2
Merge branch 'master' of heroku.com:zioprojekt

Conflicts:
	zioprojekt/offers/views.py
	zioprojekt/places/views.py
	zioprojekt/urls.py
Merge branch 'master' of github.com:projects4PB/ziowebapp

Conflicts:
	zioprojekt/choices/views.py
	zioprojekt/offers/views.py
	zioprojekt/places/views.py
	zioprojekt/urls.py