:Working on dashboard
Merge branch 'master' of https://github.com/ITRIX/FRIENDAPP