[ALLI-2175] Changed the order of login choices.
Merge branch 'master' of https://github.com/KDK-Alli/NDL-VuFind