Upgraded grunt tasks
Merge branch 'master' into router
Pre-calculate possible optional permutations of route segments