fixed minor bug with error code matching
ignore .DS_Store files
merged develop into care-portal and fixed conflict in .gitignore