Washrooms and water buttons
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/play_services_4_4_52.xml
	app/src/main/java/dtu/dtumaps/Mapper.java
	app/src/main/res/layout/fragment_map.xml