change to track HEAD
Merge branch 'master' of git@github.com:TuanFou/TuanFou.git
yogiman：团购电影的标签属性的添加

Signed-off-by: yogiman <xuyuji9000@163.com>