fixed moshaver router
added icon to text element
Text changed to TextElement
Merge origin/master into moshevereh
added last article and question
added last article and question