:fix bug for second version
Merge branch 'renewedApp' of https://github.com/ITRIX/FRIENDAPP into renewedApp