fqa ui 100% done
Merge branch 'master' of https://github.com/DVLGroup/Project_Wahanda_Alternative