1.6.0.6 original
Merge pull request #1 from PrestaShopIran/1.6.0.6

1.6.0.6 original
Merge branch '1.6.0.6' into 1.6.0.6.p

Conflicts:
	admin/themes/default/css/admin-theme_rtl.css
	classes/controller/AdminController.php
	js/rtl.js