2.1 release

git-svn-id: https://plugins.svn.wordpress.org/woocommerce-globalpay/trunk@861134 b8457f37-d9ea-0310-8a92-e5e31aec5664
2.1 release fix conflict numer in php file

git-svn-id: https://plugins.svn.wordpress.org/woocommerce-globalpay/trunk@861149 b8457f37-d9ea-0310-8a92-e5e31aec5664