Revert "Changed reordering to match upstream"

This reverts commit 991f204a165f08a3ac20b461d97e083a50ca0de4.
Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit 0eed8ec9753e3e34a77ac38c1c79d48cb1839dc7, reversing
changes made to 2463c5f4c036225c3a0a99803c9b4c5838abbe55.
Add questionnaire ID in right side view

Add a questionnaire ID label in the right side view, just after the
Global Properties label.
Merge reorder routine from upstream
Order pages in GUI by page number

Order the pages in the GUI by page number.