merged modified recovery branch into articles branch
articles controller added
articles controller content copied to make it work