Merge pull request #22 from sveby/master

More visible registration links, the four tracks
Add a map, reword the track paragraphs, use bootstrap buttons
Merge remote-tracking branch 'upstream/master'

Conflicts:
	_layouts/default.html
	assets/css/main.css