fix demo
fix demo
Consistent indentation
Minor improvements
Merge branch 'master' into gh-pages

Conflicts:
	README.md
Update Leaflet.hash
Useless filename for main page
Upgrade to Leaflet 0.7
Conventions