Merge pull request #1 from linnovate/master

merging new changes back in my fork
Merge branch 'master' of github.com:markizs/mean into nav-selected