Merge origin/master

Conflicts:
	src/DavidSantos/VirtualRouter/Router.java