Adding code to manage Indicator Type Dictionary
Merge branch 'master' of https://github.com/OCHA-DAP/DAP-System.git

Conflicts:
	DAP-System/src/main/java/org/ocha/dap/rest/AdminResource.java