Merge branch 'master' of github.com:projects4PB/ziowebapp

Conflicts:
	static/css/main.css
	static/gfx/couple-trip.png
	static/gfx/family-trip.png
	static/gfx/friends-trip.png
	static/js/main.js
	templates/offers/list.html
Merge branch 'master' of heroku.com:zioprojekt

Conflicts:
	static/js/main.js
Merge branch 'master' of heroku.com:zioprojekt

Conflicts:
	static/js/main.js
Merge branch 'master' of heroku.com:zioprojekt