minor text changes
Merge branch 'master' of https://github.com/matalaa/matalaa-web
merge
bug fixx
merge