leaflet demo to test plugins
Merge branch 'master' of https://github.com/integrityapplications/pinz into jsleaflet
testLeafletPlugins - added marker clustering
Merge branch 'master' of https://github.com/integrityapplications/pinz into jsleaflet
Merge branch 'master' of github.com:integrityapplications/pinz into jsleaflet

Conflicts:
	.gitignore
meh
Merge branch 'master' of github.com:integrityapplications/pinz into jsleaflet
client: added leaflet to webpage
Merge branch 'master' of github.com:integrityapplications/pinz into jsleaflet
Merge branch 'master' of github.com:integrityapplications/pinz into jsleaflet
client: minor changes