Merge branch 'development'
Adds new button to view a list of all rules
Merge branch 'master' into development