fix bugs / style popups
Edits / translation / bugs
Merge branch 'master' of https://github.com/Zodia/poc-tijari-mobile