Merge branch 'master' of https://github.com/runningcode/pebble-weather

Conflicts:
	src/app_message.c
	src/js/pebble-js-app.js
Merge branch 'master' of https://github.com/runningcode/pebble-weather

Conflicts:
	src/app_message.c
	src/js/pebble-js-app.js