Files for making order were modified
Merge branch 'master' of https://github.com/niralittle/Notus

Conflicts:
	NotusOSS-war/src/java/nc/notus/maps/GetLocationsServlet.java
	NotusOSS-war/src/java/nc/notus/maps/GetProviderLocations.java