cherry pick new merged configuration
cherry pick removed obsolete command
cherry pick more logging
cherry pick make performance logger thread safe
intermediate commit
prepared unittests, moved and fixed some code
moved some classes
fix some comments
fix example configuration
Implement Configuration Scenario Mapping, fixed unittests
several bugfixes - 2h load test should now run
my config for local 2h test
reset branch
refactoring
refactoring
make performance logger thread safe
Merge branch 'config_refactoring_refactoring'

Conflicts:
	code/mlmq/src/ch/ethz/mlmq/scenario/Scenario.java
	code/mlmq/src/ch/ethz/mlmq/scenario/impl/SimpleSendClient.java
fix some branche merging problems
made initial reconnect mechanics configurable
Merge branch 'master' of github.com:ganzm/AdvancedSystemsLab2013

Conflicts:
	code/mlmq/resource/config.example.properties
	code/mlmq/resource/config.template.properties
	code/mlmq/src/ch/ethz/mlmq/client/ClientConfiguration.java
	code/mlmq/src/ch/ethz/mlmq/client/ClientImpl.java
	code/mlmq/src/ch/ethz/mlmq/command/CommandFileHandler.java
	code/mlmq/src/ch/ethz/mlmq/common/BalancedScenarioConfiguration.java
	code/mlmq/src/ch/ethz/mlmq/common/CommandFileHandler.java
	code/mlmq/src/ch/ethz/mlmq/common/CommandListener.java
	code/mlmq/src/ch/ethz/mlmq/main/Main.java
	code/mlmq/src/ch/ethz/mlmq/scenario/BrokerScenario.java
	code/mlmq/src/ch/ethz/mlmq/scenario/ClientScenario.java
	code/mlmq/src/ch/ethz/mlmq/scenario/Scenario.java
	code/mlmq/src/ch/ethz/mlmq/scenario/ScenarioFinder.java
	code/mlmq/src/ch/ethz/mlmq/scenario/impl/SimpleSendClient.java
	code/mlmq/src/ch/ethz/mlmq/scenario/scenarios/SimpleSendClient.java
	code/mlmq/src/ch/ethz/mlmq/server/Broker.java
	code/mlmq/src/ch/ethz/mlmq/server/BrokerCommandFileHandler.java
	code/mlmq/src/ch/ethz/mlmq/server/BrokerConfiguration.java
	code/mlmq/src/ch/ethz/mlmq/testrun/TestRunSimpleSend.java
	code/mlmq/test/ch/ethz/mlmq/test/BrokerCommandFileHandlerTest.java
	code/mlmq/test/ch/ethz/mlmq/test/ScenarioConfigurationTest.java