增加自定义指令controller&controllas属性示例代码
设置文件排除规则
Merge branch 'master' into dev