Merge remote-tracking branch 'origin/master' into akun

@@ -91,7 +91,7 @@ class ReplaceHtml extends Command
                 'source_id'=>$v['id'],
                 'source_id'=>$v['id'],
                 'is_custom'=>$info['is_custom'],
                 'is_custom'=>$info['is_custom'],
                 'is_list'=>$info['is_list'],
                 'is_list'=>$info['is_list'],
-                'is_rollback'=>$info['rollback'],
+                'is_rollback'=>$info['is_rollback'],
                 'template_id'=>$info['template_id'],
                 'template_id'=>$info['template_id'],
                 'created_at'=>date('Y-m-d H:i:s'),
                 'created_at'=>date('Y-m-d H:i:s'),
                 'updated_at'=>date('Y-m-d H:i:s')
                 'updated_at'=>date('Y-m-d H:i:s')