committing more changes
Merge branch 'master' of git://github.com/sotandeka/care2x

Conflicts: