route bugfixes and part of delphimethod
Merge branch 'project' of github.com:tp199314/pm into project
Merge branch 'project' into design
rbs changes