dev-refactoring ngroutes
Merge branch 'master' into revamp
Merge pull request #2 from semajed/revamp

Revamp