Merge branch 'master' of https://github.com/TechnoSave/TechnoSave
:merged maps
Merge branch 'master' of https://github.com/TechnoSave/TechnoSave
Merged De10 8am
Fixed bug with Angular views, added routes, updated bower and package.json
attempt to fix heroku
Merge pull request #62 from essamjoubori/master

Fixed bug with Angular views, added routes, updated bower and package.json