Add photo overlay to tab map
Merge branch 'add-photo-overlay-to-tab-map'

Conflicts:
	www/css/style.css
	www/js/controllers.js
Small corrections in controllers
Merge branch 'master' of github.com:AdriennePind/fish-journey