Merge branch 'v3' of https://github.com/mycard/mycard into v3

app/mycard.component.css

-<<<<<<< HEAD
 body {
     font-family: "Helvetica Neue", Helvetica, Arial, 'Source Sans Pro', "Microsoft YaHei", 'Microsoft JhengHei', "WenQuanYi Micro Hei", sans-serif;
 }
@@ -6,6 +5,7 @@ body {
 nav {
     -webkit-app-region: drag;
 }
+
 nav.darwin {
     padding-left: 80px;
 }
@@ -16,11 +16,14 @@ nav.darwin {
 
 .navbar-right > div, #user > .item {
     float: left;
-    margin: 0 0.5rem
+    margin: 0 0.5rem;
+}
+
 #wrapper {
     padding-top: 60px;
     /*margin-bottom: 60px;*/
 }
+
 .nav-right {
     float: right;
 }

index.html

@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
+    <link rel="stylesheet" href="node_modules/font-awesome/css/font-awesome.min.css">
     <!--<link rel="stylesheet" href="styles.css">-->
     <!-- 1. Load libraries -->
     <!-- Polyfill(s) for older browsers -->

package.json

@@ -29,13 +29,14 @@
     "@angular/router": "latest",
     "@angular/router-deprecated": "latest",
     "@angular/upgrade": "latest",
-    "systemjs": "latest",
+    "angular2-in-memory-web-api": "latest",
+    "bootstrap": "next",
     "core-js": "latest",
+    "font-awesome": "^4.6.3",
     "reflect-metadata": "latest",
     "rxjs": "latest",
-    "zone.js": "latest",
-    "angular2-in-memory-web-api": "latest",
-    "bootstrap": "next"
+    "systemjs": "latest",
+    "zone.js": "latest"
   },
   "devDependencies": {
     "concurrently": "latest",