updated resources forms and news
resolve merge conflicts
Merge remote-tracking branch 'origin'