weatherz
Merge branch 'master' of https://github.com/vdclouis/dynomite

# By Pierre
# Via Pierre
* 'master' of https://github.com/vdclouis/dynomite:
  routes
  returns

Conflicts:
	app/js/controllers.js
	app/js/services.js
Merge branch 'master' into p-branch

Conflicts:
	app/js/services.js