these files should never have gotten in here
Merge branch 'inline_editing' of github.com:homeserve-alliance/comfortable-mexican-sofa into inline_editing