Fix: Works for both normalized modules and external modules
Merge pull request #673 from simnandez/develop

New: Add ES formated address country rule
Qual: Try to delete no more used addpropal.php