- added "new rule" button
Merge remote-tracking branch 'origin/master'