test commit
Merge remote-tracking branch 'origin/DeleteRegionDictionaryButton2-cj'

Conflicts:
	DAP-System/src/main/java/org/ocha/dap/persistence/dao/UserDAO.java
	DAP-System/src/main/java/org/ocha/dap/rest/APIResource.java
	DAP-System/src/main/java/org/ocha/dap/rest/AdminResource.java
	DAP-System/src/main/java/org/ocha/dap/rest/AuthenticationFilter.java
	DAP-System/src/test/java/org/ocha/dap/rest/APIResourceTest.java