Merge pull request #1 from OpenBazaar/master

test
Merge pull request #2 from OpenBazaar/master

test 2
checkstyle.sh: add ./env directory to exclude

Signed-off-by: Thomas Stilwell <stilwellt@openlabs.co>
fix style errors

Signed-off-by: Thomas Stilwell <stilwellt@openlabs.co>
Update run.sh

run brew only on OSX
Merge pull request #375 from benemorius/checkstyle

fix checkstyle.sh and some style errors
run.sh: update default web interface port in help output

port is random since commit 6fedf87e10a793da642c877427268013e26f635b
(Web Port is now randomized by default. Fixes Issue #301)

Signed-off-by: Thomas Stilwell <stilwellt@openlabs.co>
use sigterm instead of sigkill to kill the server

sys.exit() causes a hang for some reason but
os._exit() does not

Signed-off-by: Thomas Stilwell <stilwellt@openlabs.co>
Merge pull request #376 from Rav3nPL/patch-1

fix ./run.sh error message on linux
Merge pull request #374 from benemorius/help-output

run.sh: update default web interface port in help output
add new env variable HTTP_PORT to setup port forward in docker nat network.
fix benign tuple error

Signed-off-by: Thomas Stilwell <stilwellt@openlabs.co>
Merge pull request #379 from benemorius/tuple

fix benign tuple error
add env MARKET_PORT
Added JSON syntax highlighting and Fixed JSON documents
Added XML syntax highlighting and Fixed inaccurate XML comment
Added XML syntax highlighting and Fixed XML comment
Replaced XML entity
Callback array being overloaded
Merge remote-tracking branch 'upstream/master'