put the changes from server to github
Merge branch 'master' of https://github.com/metapolator/metapolator
Merge branch 'master' of https://github.com/metapolator/metapolator
Merge branch 'master' of https://github.com/metapolator/metapolator
Merge branch 'master' of https://github.com/metapolator/metapolator
Merge branch 'master' of https://github.com/metapolator/metapolator

Conflicts:
	mf2pt1.pl
Merge branch 'master' of https://github.com/metapolator/metapolator
Merge branch 'master' of https://github.com/metapolator/metapolator
Merge branch 'master' of https://github.com/metapolator/metapolator
Merge branch 'master' of https://github.com/metapolator/metapolator
Merge branch 'master' of https://github.com/metapolator/metapolator
Merge branch 'master' of https://github.com/metapolator/metapolator
Merge branch 'master' of https://github.com/metapolator/metapolator
Merge branch 'master' of https://github.com/metapolator/metapolator
Merge branch 'master' of https://github.com/metapolator/metapolator
Merge branch 'master' of https://github.com/metapolator/metapolator
Merge branch 'master' of https://github.com/metapolator/metapolator
Merge branch 'master' of https://github.com/metapolator/metapolator
Merge branch 'master' of https://github.com/metapolator/metapolator