Merge branch 'ondev-gcs' into 'dev'

env move

See merge request !16

context.js

 var _dot = require('dot-prop');
 
 var CONFIG_PATH = __dirname + '/conf/config';
-var ENV_MAP = __dirname + '/conf/env';
+var ENV_MAP = __dirname + '/env';
 
 var cfg = require(CONFIG_PATH);
 

env/default.json

+[
+    {"env":"BSCONFIG_AMQP_TYPE","conf":"amqp.type"},
+    {"env":"BSCONFIG_AMQP_URL","conf":"amqp.url"},
+    {"env":"BSCONFIG_MQTT_URL","conf":"mqtt.url"},
+    {"env":"BSCONFIG_MEMSTORE_TYPE","conf":"memstore.type"},
+    {"env":"BSCONFIG_MEMSTORE_URL","conf":"memstore.url"},
+    {"env":"BSCONFIG_STORAGE_REPOSITORY","conf":"storage.repository"},
+    {"env":"BSCONFIG_STORAGE_APIHOSTNAME","conf":"storage.api_hostname"},
+    {"env":"BSCONFIG_SECRET_TEXT","conf":"auth.secret.value"}
+]
\ No newline at end of file

env/index.js

+module.exports = require('./default.json');
\ No newline at end of file