Remove old backup files
Merge branch 'master' of github.com:timschofield/care2x
Remove conflicts