Do a design
Merge remote-tracking branch 'gf3/fun-time-design' into redesign

Conflicts:
	dist/js/bundle.js
	dist/js/dist/js/maps/bundle.js.map
Code formatting.
removed image stream
updated css