Reorder the project depenedencies in the make file alphabetically.
Make the 'city' field inline in the user_register form.
Merge branch 'development' of github.com:nesi/nesi-webportal into development