Renamed SettingsController bean to amrsCustomizationSettings using @Controller("amrsCustomizationSettings") to avoid conflict with
OpenMRS core bean names
Merge branch 'master' of https://github.com/mhawila/openmrs-module-amrscustomization
Amended a commit message