Setings / Add options to retrieve settings as tree (default) or flat list.
Settings / Add missing output for xml.info?tye=harvester.
Cleaning.
Metadata Status / Sort status by ordering (#228).
Upgrade Jetty to 8.x for maven jetty:run (#223).
Setings / Add options to retrieve settings as tree (default) or flat list.
Widgets / Add nbsp between checkbox and title.
Fix compilation issue.
Metadata Status / Sort status by displayorder and labels - setting displayorder to null, sort by label like before (#228).
On webdav harvesters, try to keep the same UUID if possible.
Merge pull request #229 from Delawen/webdavharvestuuid

On webdav harvesters, try to keep the same UUID if possible.
Metadata Status / Sort status by ordering - applied to search advanced form in legacy ui (#228).
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'upstream/develop' into spring-data-jpa

Conflicts:
	core/src/main/java/org/fao/geonet/kernel/setting/SettingManager.java
	services/src/main/java/org/fao/geonet/services/config/Get.java