Merge branch 'master' into development
adds hover state to view all rules button
Merge branch 'development'