Merge branch 'jansa'

admin/application/views/Templates/header-menu.php

@@ -30,7 +30,7 @@ if($this->session->userdata('logged_in')){
               <li class="dropdown user user-menu">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                   <img src="<?php echo base_pic_url().$login['profile_picture']?>" class="user-image" alt="User Image">
-                  <span class="hidden-xs"><?php echo $login['display_name']?></span>
+                  <span class="hidden-xs"><?php echo decrypt_data($login['display_name'])?></span>
                 </a>
                 <ul class="dropdown-menu">
                   <!-- User image -->

admin/application/views/Templates/left-menu.php

@@ -14,7 +14,7 @@
              <img src="<?php echo base_pic_url().$login['profile_picture'] ?>" class="img-circle" alt="User Image" style="width: 45px;height: 45px;">
             </div>
             <div class="pull-left info">
-              <p><?php echo $login['display_name']?></p>
+              <p><?php echo decrypt_data($login['display_name'])?></p>
               <a href="#"><i class="fa fa-circle text-success"></i> Online</a>
             </div>
           </div>