[MK,RG]{refactoring} R2 - Refactored Warnings, Changed Settings Icon
[MK,RG]{Merged} M1 - Merged Conflicts:
	NAM/res/values/strings.xml
	NAM/src/com/sw/nam/AddContactDialog.java