Add: npm underscore, Access-Control-Allow-Headers
Merge remote-tracking branch 'origin/develop' into develop