Merge branch 'hotfix/place'
fixing links
Merge branch 'hotfix/m_date_fix' into develop