Merge branch 'master' of /home/jeff/dev/proj/dius/CRApp with conflicts.
Fix for routes