Merge branch 'aiselp-master'

# Conflicts:
#	app/src/main/java/org/autojs/autojs/core/looper/Timer.kt
#	app/src/main/java/org/autojs/autojs/engine/module/AssetAndUrlModuleSourceProvider.kt
#	version.properties

.gitignore

@@ -10,6 +10,7 @@
 output.json
 output-metadata.json
 desktop.ini
+sync.ffs_db
 
 .bak
 .git