initial test set-up
import reorder
ensure all bytes are received
Merge branch 'master' into s7comm_tests

Conflicts:
	conpot/protocols/s7comm/s7_server.py
Basic s7 test
Using the default template
do some actual testing
also waitall for the initial payload
this basically works to some extent..
Tests for #123
Merge remote-tracking branch 'origin/s7comm_tests' into s7comm_tests

Conflicts:
	conpot/tests/test_s7_server.py
Merge branch 's7comm_tests'
added objective to s7 test
Fixed the landscape badge
disabling protocols was not working
initial thoughts and code for proxy support
basic tcp proxy working
logging
logging of socket data
kampstrup proxy template