recovered old version
Merge branch 'recovery' into articles
fixed some directory problems with views