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