Admin / template / display order is not saved & restored properly (#1287).

Conflicts:

	web/src/main/java/org/fao/geonet/guiservices/templates/SaveDisplayOrder.java