fix(merge): clean up merge conflicts

This removes legacy exchange rate code.

server/config/routes.js

@@ -76,7 +76,7 @@ var suppliers            = require('../controllers/admin/suppliers');
 var multipart            = require('connect-multiparty');
 
 exports.configure = function (app) {
-  winston.log('debug', 'Configuring routes');
+  winston.debug('Configuring routes');
 
   // exposed to the outside without authentication
   app.get('/languages', users.getLanguages);

server/models/updates/synt.sql

@@ -381,21 +381,6 @@ ALTER TABLE account ADD FOREIGN KEY (`account_type_id`) REFERENCES account_type
 ALTER TABLE `project`
 ADD `locked` BOOLEAN NOT NULL;
 
-
-
--- Changing the exchange_rate table
--- Date: 2016-02-05
--- By: Chris LOMAME
-
-ALTER TABLE `exchange_rate`
-CHANGE `enterprise_currency_id` `enterprise_id` TINYINT(3) UNSIGNED NOT NULL;
-
-ALTER TABLE `exchange_rate`
-CHANGE `foreign_currency_id` `currency_id` TINYINT(3) UNSIGNED NOT NULL;
-
-ALTER TABLE `exchange_rate`
-CHANGE `date` `date` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP;
-
 -- Linking service o enterprise directly
 -- Date : 2016-02-02
 -- By : Dedrick Kitamuka

server/test/api/locations.js

@@ -1,3 +1,4 @@
+/* jshint expr:true */
 var chai = require('chai');
 var expect = chai.expect;
 var uuid = require('node-uuid');