Edited FAQ
added process.env.PORT to web.js
Added process.env.PORT to web.js
Merge branch 'develop' into staging