Update base version

- Add leaflet-angular-directive;
Remove div and console.log
Add Google baselayer
Chapter 2 - Clustering - DevGuide Code
Merge branch 'v1' of github.com:gogeolbs/devguide into v1

Conflicts:
	config-sample.js
	public/js/app.js
	public/js/controllers.js
	public/js/lib/leaflet-plugins/cluster/leaflet.tilecluster.js
	public/js/services.js
	routes/index.js
	views/index.jade
	views/layout.jade
Merge branch 'v1'

Conflicts:
	public/js/app.js
	public/js/controllers.js
	public/js/lib/angular/angular-loader.js
	public/js/lib/angular/angular-loader.min.js
	public/js/lib/angular/angular-mocks.js
	public/js/lib/angular/angular-resource.js
	public/js/lib/angular/angular-resource.min.js
	public/js/lib/leaflet-plugins/cluster/leaflet.tilecluster.js
	public/js/services.js
	views/index.jade
Chapter 3 - Map Style - DevGuide Code
Merge branch 'v2' of github.com:gogeolbs/devguide into v2

Conflicts:
	public/js/app.js
	public/js/controllers.js
	public/js/lib/angular/angular-loader.js
	public/js/lib/angular/angular-loader.min.js
	public/js/lib/angular/angular-mocks.js
	public/js/lib/angular/angular-resource.js
	public/js/lib/angular/angular-resource.min.js
	public/js/services.js
	views/index.jade
Merge branch 'v2'

Conflicts:
	public/js/app.js
	public/js/controllers.js
	public/js/services.js
Configure URL prefix
Merge branch 'v2'
Chapter 3 - Interactive Maps - DevGuide Code
Chapter 4- Spatial filters - DevGuide Code
Remove tiemout
Chapter 6 - Queries - DevGuide Code