TRUNK:2119 Fixed the hardcoding, if/else,try/catch, and bracket issues
TRUNK:2119 Fixed the hardcoding, if/else,try/catch, and bracket issues
Fixed spelling
Merge remote-tracking branch 'origin/TRUNK-2119' into TRUNK-2119

Conflicts:
	webapp/src/main/webapp/WEB-INF/messages.properties
	webapp/src/main/webapp/WEB-INF/view/uncaughtException.jsp