Modified the string methods in ApplicationConversionServiceFactoryBean as they are used to populate the dropDown lists on forms
Also merging in some code I missed when adding the emergency messages and emergency alert logs