Merge remote-tracking branch 'qortal/master'

# Conflicts:
#	.gitignore
#	pom.xml
#	src/main/java/org/qortal/controller/Controller.java
#	src/main/java/org/qortal/gui/SysTray.java
#	src/main/java/org/qortal/settings/Settings.java
#	src/main/resources/i18n/ApiError_en.properties
#	src/test/java/org/qortal/test/CryptoTests.java
#	src/test/resources/test-settings-v2.json

.gitignore

@@ -1,4 +1,5 @@
 /db*
+/lists/
 /bin/
 /target/
 /qortal-backup/
@@ -15,8 +16,8 @@
 /settings.json
 /testnet*
 /settings*.json
-/testchain.json
-/run-testnet.sh
+/testchain*.json
+/run-testnet*.sh
 /.idea
 /qortal.iml
 .DS_Store
@@ -25,4 +26,6 @@
 /run.pid
 /run.log
 /WindowsInstaller/Install Files/qortal.jar
+/*.7z
+/tmp
 /data*