new style
new
new
Merge branch 'master' of https://github.com/Zodia/poc-tijari.git

Conflicts:
	attijari-poc-mobile-project/apps/attijari_poc_mobile_app/common/css/main.css
	attijari-poc-mobile-project/apps/attijari_poc_mobile_app/ipad/native/www/default/css/main.css