add calendar_view, add document, news and image view
merge conflict