Merge branch 'ticket-359' into equation-element
fixing equation plugin
undoing some changes that got pulled over from testing
kill border on equation elements and minimize whitespace
add numbers to equations
Merge branch 'equation-element' into testing