Fix reording for simplex documents (Thanks to Daniele Di Domizio)

This fixes reordering of simplex documents and slightly improves the logic
to figure out whether a sheet needs to be considered for reordering.
Revert "Changed ordering of pages in the GUI"

This reverts commit de72353f3d4da1605b929b6834ecb8f442feffdf.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	sdaps/reorder/__init__.py
Changed reordering to match upstream
Changed positioning of questionnaire ID (right side)