Updated version of contacts importer
reverted the make file to include placeholders again.
Merge branch '7.x-stable' of git.drupal.org:project/erpal into 7.x-stable