final ups
Merge branch 'dev' of https://github.com/Fattaf/ad_test into dev