Merge Rules Page into develop branch

Rules page completed, merged into the develop branch in order to bring personal develop upto date.