Moved config file to match the new convention
Upgraded to new americano version
americano version
americano version
Merge branch 'dev' into jsilvestre-migration/americano
Merge branch 'jsilvestre-migration/americano'