Move Router to router.js
Merge branch 'develop'