Merge remote-tracking branch 'origin/develop' into develop

@@ -67,7 +67,7 @@
                         <span class="form-control select-box">
                             <select class="select" size="1">
                                 <?php foreach ($this->session->repayments as $k=>$v):?>
-                                <option <?=$item == payBackType ? 'selected'  : '' ?> value="<?=$k?>"><?=$v?></option>
+                                <option <?=$item->payBackType == $k ? 'selected'  : '' ?> value="<?=$k?>"><?=$v?></option>
                                 <?php endforeach;?>
                             </select>
                         </span>