chagned order of if statements in figureView
Merge branch 'pjax' into release-v0.5