Merge pull request #6 from geoworks/develop

Develop
Merge pull request #11 from geoworks/develop

Full server with Angular
Merge pull request #13 from geoworks/develop

fix to heroku
Merge pull request #15 from geoworks/develop

fix mongoDB connect
Merge pull request #17 from geoworks/master

Master