commit my edit
commit
Merge branch 'dev' of https://github.com/herchg/RCServer into dev

Conflicts:
	RCApi/nbproject/private/private.properties
	RCApi/nbproject/project.properties
	RCApi/src/java/wi/server/rc/api/ApplicationConfig.java
	RCApi/src/java/wi/server/rc/api/Order2Resource.java