Merge branch 'master' of github.com:bjolseth/spiderpig

Conflicts:
	tshsimulator/src/logmodel.cpp
	tshsimulator/src/logmodel.h
	tshsimulator/src/server.cpp
Merge branch 'master' of github.com:bjolseth/spiderpig

Conflicts:
	tshsimulator/src/logmodel.cpp
	tshsimulator/src/logmodel.h
	tshsimulator/src/server.cpp