Added acceptance test to ensure that a feed is removed from its old folder when adding it to a new folder.
When moving a feed which is in a folder to another folder which already exists, if the old folder has no more feeds, it is deleted.
Added missing JSON template. It should have been added in commit e3e921cf312a7f2a45d10ca638e897ff943c601a .