Javadocs done on Routing
Merge branch 'master' of https://github.com/cjsolomon/Mulit-Modal