Added Mapbox to /map page and added markers functionality to map
Merge changes from upstream.

 Changes to be committed:
added marker functionality and merged local changes
Added Categories CRUD Module
charles merge complete
edited map.controller and map.config
updated package.json file
added Facebook OAuth Login
updated README.md file
added facebook OAuth controller and login link on client.view.html
Fixed random errors left over from massive merge.