Display paperfigure-combination in edit view.
Removed unused pacakges from java files
Merge branch 'master' of https://github.com/mjdslob/mathunited