Merge branch 'develop' of https://github.com/dev-fsociety/DFS-2016 into develop

src/Template/Layout/default.ctp

@@ -54,7 +54,7 @@ $cakeDescription = 'CampCare';
             <div class="top-bar-right">
               <ul class="menu">
                 <?php if($this->request->session()->read('Auth.User.id') != null): ?>
-                <li><a href="<?= $this->Url->build('/users', true); ?>" class="profile_icon"><i class="fi-torso"></i></a></li>
+                <li><a href="<?= $this->Url->build('/users', true); ?>" class="profile_icon"><i class="fi-torso icon_fix"></i></a></li>
                 <li><a href="<?= $this->Url->build('/users/logout', true); ?>" class="profile_icon"><i class="fi-power"></i></a></li>
                 <?php endif; ?>
               </ul>

webroot/css/custom.css

@@ -20,6 +20,11 @@
 	height: 37px;
 }
 
+.icon_fix{
+	border-right: 1px solid rgb(0, 0, 0);
+	padding-right: 5px;
+	margin-right: 5px;
+}
 
 .card {
   overflow: hidden;