full clean and merge to kriangs dev
gitattributes fix
Merge branch 'master' of https://github.com/Tech-Grind/ng-techgrind
menu, controllers
incomplete fixes