Merge branch 'shaun'
minor
cleanup
improved layout
Layout changes, user locations
fixing image names with bad chars
Zoom working.. added night view:)
Merge branch 'master' of https://github.com/theguice/holiday-viz
added trans mode to user info
overlay updates
Merge branch 'master' into shaun