added view and controller
merged with recovery branch
update articles model
merge
merge