Revert 09fdb00..4584c55

This rolls back to commit 09fdb00afc94e81a38b1732f972f1a8a994e96d7.
Revert "Revert 09fdb00..4584c55"

This reverts commit 96e1c9dcd1f98b0a65ac8e871d90e5f0f4a63f91.
Merge branch 'master' of https://github.com/metapolator/metapolator
added extra xmltomf_new.py for control points