Merge branch 'master' of github.com:carlemil/JuliaLiveWallpaper

Conflicts:
	src/se/kjellstrand/julia/JuliaWallpaperService.java
	src/se/kjellstrand/julia/julia.rs
Merge branch 'master' of https://github.com/carlemil/JuliaLiveWallpaper

Conflicts:
	src/se/kjellstrand/julia/JuliaWallpaperService.java