fix logstash grok/geoip to observe on openbazaar network hello map
Merge pull request #515 from hoffmabc/master

Notarizations gets its own page
Renamed tornadoloop.py to openbazaar_daemon.py
Changed start/stop scripts accordingly.
Merge pull request #518 from sophron/rename-tornadoloop

Rename tornadoloop to openbazaar_daemon
Merge pull request #516 from hoffmabc/master

Show actual amount in multisig address when viewing orders
Don't upgrade on Ubuntu.
Move saveSettings() to settings.js
Merge pull request #519 from sophron/remove-upgrade-on-configure

Don't upgrade on Ubuntu
Merge pull request #520 from simondlr/settings_fix

Move saveSettings() to settings.js
Merge remote-tracking branch 'upstream/master' into kibana-hello-map
Merge pull request #509 from y12studio/kibana-hello-map

fix logstash grok/geoip to observe on openbazaar network hello map
Switch empty order messages