Merge branch 'devfest-brazil-map' into gh-pages

Conflicts:
	_site/blog/call-for-papers/index.html
	_site/blog/hello-world/index.html
	_site/blog/index.html
	_site/cod/index.html
	_site/index.html
	_site/logistics/index.html
	_site/speakers/index.html
	_site/team/index.html
Deleting Thumb.db
Merge branch 'gh-pages' of github.com:oieduardorabelo/zeppelin into gh-pages
Merge branch 'master' into gh-pages
Updating info for SP
Statistic image
Updating Google Maps
Merge branch 'gh-pages'