Added cachebust to preloader.js, main.js and main.css
Fixed intro bug by changing googleMap init deferred ready
Added inline subpage templates and cache busting for main.html partial
Updated readme a bit
Made Google Map legal links clickable
Fixed double marker bug
Readme conflicted with master branch
Merge branch 'dev'

Conflicts:
	README.md
Getting used to git, comitting readme for the 23rd time