Merge pull request 'staging upload 23/08/14' (#132) from staging into master

Reviewed-on: ordo/adw-backend#132

app/Http/Controllers/Controller.php

@@ -106,7 +106,7 @@ class Controller extends BaseController
         if($condition){
             if(isset($condition['select'])){
                 foreach($condition['select'] as $select){
-                    $builder = $builder->select($alias.".".$select);
+                    $builder = $builder->addSelect($alias.".".$select);
                 }
             }
             if(isset($condition['joins'])){