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

# Conflicts:
#	Controller/SensorGateway/SmartSceneController.py

Model/models.py

@@ -2633,6 +2633,7 @@ class SmartScene(models.Model):
     tasks = models.CharField(default='', max_length=255, verbose_name=u'任务')
     is_all_day = models.SmallIntegerField(default=0, verbose_name=u'是否全天')  # 0: 不设置时间, 1: 全天, 2: 非全天
     effective_time_id = models.IntegerField(default=0, verbose_name=u'关联场景执行时间id')
+    is_all_day = models.BooleanField(default=False, verbose_name=u'是否全天')
     is_enable = models.BooleanField(default=True, verbose_name=u'是否开启')
     device_data = models.CharField(default='', max_length=255, verbose_name=u'设备场景数据')
     created_time = models.IntegerField(default=0, verbose_name='创建时间')