Clean up warnings in Starter
Merge branch 'martijn' into wander-web
Revert. Apparently generic JCombo's are JDK7 only.

This reverts commit 81fa28fce56abf107e50d8cdc2b361054bd46704.
Clean up warnings in Starter again
Make MockLinkLayer a FrameLinkLayer
Make MockLinkLayer a Startable
Add MockLinkLayerTest
Clean up MockLinkLayerTest
Twostack bench progress
Add MockFrameLinkLayer
Merge branch 'janjelle' into wander-web

Conflicts:
	src/network/tpp/TPPNetworkLayer.java
	src/starter/Starter.java
Remove twostack
Remove network layer lock
Merge branch 'martijn' into wander-web
Add routes file to fix Travis
Fix retransmissions
Remove Chat and Files handlers from web UI
Merge branch 'martijn' into janjelle
Update WebServiceTest
Create a routes.txt file in Travis