weather endpoint
no unnecessary hide_alert
Merge branch 'develop'

Conflicts:
	javascripts/src/app.coffee