:expen add for validation label issue fix
Merge branch 'master' of https://github.com/ITRIX/FRIENDAPP