Start of theming. Removed slider and replaced with text links.
Merge branch 'master' of https://github.com/NomadMap/nomadmap

Conflicts:
	.gitignore
	code/js/views/trip/EditTripView.js
	todo.txt
Improved look of map info popups and clusters