removed iron-router-active dep
Merge branch 'dev'