application.css
[assets] custom makers
[toilets][map] add toilet link
footer display
merge conflict css
[data] add osm
Merge branch 'develop'