Merge branch 'MLAB-87' into 'testing'

rename routes-account into account

See merge request !82

app.js

@@ -61,7 +61,7 @@ app.use(function(req, res, next) {
   next();
 });
 
-require('./routes/routes-account')(app, config, passport, lang);
+require('./routes/account')(app, config, passport, lang);
 require('./routes/public')(app, config, lang);
 
 // Handle 404