Conflicts:
	.classpath
	pom.xml
	src/main/java/teetime/framework/A0UnconnectedPort.java
	src/main/java/teetime/framework/A1ThreadableStageCollector.java
	src/main/java/teetime/framework/A2InvalidThreadAssignmentCheck.java
	src/main/java/teetime/framework/A3PipeInstantiation.java
	src/main/java/teetime/framework/A4StageAttributeSetter.java
	src/main/java/teetime/framework/AbstractInterThreadPipe.java
	src/main/java/teetime/framework/AbstractService.java
	src/main/java/teetime/framework/AbstractStage.java
	src/main/java/teetime/framework/ITraverserVisitor.java
	src/main/java/teetime/framework/RunnableConsumerStage.java
	src/main/java/teetime/framework/Stage.java
	src/main/java/teetime/framework/TeeTimeThread.java
	src/main/java/teetime/framework/ThreadService.java
	src/main/java/teetime/framework/exceptionHandling/TerminateException.java
	src/main/java/teetime/framework/exceptionHandling/package-info.java
	src/main/java/teetime/framework/pipe/SpScPipe.java
	src/main/java/teetime/framework/signal/TerminatingSignal.java
	src/main/java/teetime/framework/test/package-info.java
	src/main/java/teetime/stage/basic/distributor/dynamic/CreatePortAction.java
	src/main/java/teetime/stage/basic/distributor/dynamic/RemovePortAction.java
	src/main/java/teetime/stage/basic/distributor/strategy/RoundRobinStrategy2.java
	src/main/java/teetime/stage/basic/merger/Merger.java
	src/main/java/teetime/stage/basic/merger/dynamic/CreatePortAction.java
	src/main/java/teetime/util/framework/port/PortActionHelper.java
	src/main/java/teetime/util/io/network/AbstractTcpReader.java
	src/test/java/teetime/framework/TerminationTest.java
	src/test/java/teetime/stage/basic/distributor/dynamic/DynamicDistributorTest.java
	src/test/java/teetime/stage/basic/merger/dynamic/DynamicMergerTest.java

Twitter

add twitter functionality to the website

See merge request !77