Merge origin/master

Conflicts:
	routes/access.js
	routes/ci.js
	routes/config-template.js
	routes/index.js
	routes/options.js
	routes/organisation.js
	routes/relation.js
	routes/structure.js

routes/access.js

@@ -6,7 +6,7 @@ const path = require('path');
 const config = require('./config');
 const pg = require('pg');
 const winston = require('winston');
-const connectionString = process.env.DATABASE_URL || config.storageConfig;
+const connectionString = process.env.DATABASE_URL || config.db_url;
 
 
 router.post('/types', (req, res, next) => {

routes/ci.js

@@ -7,7 +7,7 @@ var options = require('./options');
 const pg = require('pg');
 const config = require('./config');
 const winston = require('winston');
-const connectionString = process.env.DATABASE_URL || config.storageConfig;
+const connectionString = process.env.DATABASE_URL || config.db_url;
 
 router.post('/enterprise_service/list', (req, res, next) => {
         var pool = new pg.Pool({

routes/config-template.js

-module.exports.storageConfig='postgres://user:password@server:port/database';
+module.exports.db_url='postgres://user:password@server:port/database';

routes/index.js

@@ -5,7 +5,7 @@ const path = require('path');
 const config = require('./config');
 const pg = require('pg');
 const winston = require('winston');
-const connectionString = process.env.DATABASE_URL || config.storageConfig;
+const connectionString = process.env.DATABASE_URL || config.db_url;
 
 
 /* GET home page. */

routes/options.js

@@ -6,7 +6,7 @@ const path = require('path');
 const config = require('./config');
 const pg = require('pg');
 const winston = require('winston');
-const connectionString = process.env.DATABASE_URL || config.storageConfig;
+const connectionString = process.env.DATABASE_URL || config.db_url;
 
 router.post('/family_type', (req, res, next) => {
     var pool = new pg.Pool({

routes/organisation.js

@@ -6,7 +6,7 @@ const path = require('path');
 const config = require('./config');
 const pg = require('pg');
 const winston = require('winston');
-const connectionString = process.env.DATABASE_URL || config.storageConfig;
+const connectionString = process.env.DATABASE_URL || config.db_url;
 
 
 router.get('/list/nodes/:centralNode', (req, res, next) => {

routes/relation.js

@@ -6,7 +6,7 @@ const path = require('path');
 const config = require('./config');
 const pg = require('pg');
 const winston = require('winston');
-const connectionString = process.env.DATABASE_URL || config.storageConfig;
+const connectionString = process.env.DATABASE_URL || config.db_url;
 
 
 router.post('/types', (req, res, next) => {

routes/structure.js

@@ -6,7 +6,7 @@ const path = require('path');
 const config = require('./config');
 const pg = require('pg');
 const winston = require('winston');
-const connectionString = process.env.DATABASE_URL || config.storageConfig;
+const connectionString = process.env.DATABASE_URL || config.db_url;
 
 
 router.post('/family_types', (req, res, next) => {