Merge remote-tracking branch 'origin/master'

public/Config.js

@@ -5,4 +5,8 @@ Config.Server = {
   "hostname": "localhost",
   "port": 16918,
   secure: false
+}
+
+Config.Site = {
+  base: "/gwent-online/site/public"
 }

site/client/app/app.js

@@ -1,6 +1,8 @@
 var Vue = require('vue');
 var router = require('./routes');
 
+require('../../../public/Config.js');
+
 Vue.use(require('vue-resource'));
 Vue.http.headers.common['X-CSRF-TOKEN'] = $('.token').attr('content');
 

site/client/assets/sass/_nav.scss

@@ -44,5 +44,7 @@ nav {
 
   a {
     padding: 12px;
+    color: $main;
+    text-shadow: none;
   }
 }