Implemented static routing and added choice of routing to settings
Merge branch 'static_routing'