getresources in background
none
Merge branch 'master' of https://github.com/rob-med/Elaborato

Conflicts:
	src/db/DBConnector.java
	src/db/Task.java
	src/download/Downloader.java
	src/download/Downloader3D.java
	src/download/ImageDownloader.java
	src/download/SoundDownloader.java
	src/download/TextDownloader.java
	src/download/VideoDownloader.java
	src/download/VimeoDownloader.java
	src/main/Main.java
	src/selenium/SeleniumUtil.java