Fixed dynamic routes
General fixes
Merge origin/master

Conflicts:
	src/route/DynamicRoute.java