Merge branch 'master' into testnet

# Conflicts:
#	cordova/config.xml
#	package.json
#	webkitbuilds/setup-win32.iss
#	webkitbuilds/setup-win64.iss

Author: tonyofbyteball

cordova/config.xml

@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
 <widget id="org.byteball.wallet.testnet"
-  version="2.5.0"
-  android-versionCode="1072"
-  ios-CFBundleVersion="2.5.0" xmlns:android="http://schemas.android.com/apk/res/android">
+  version="2.6.0"
+  android-versionCode="1073"
+  ios-CFBundleVersion="2.6.0" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>Byteball TN</name>
     <description>
       Byteball wallet for testnet.