put commit to end of all process
Merge branch 'metap-1.3' of github.com:metapolator/metapolator into metap-1.3
fixed conflict messages