update timeout
Merge branch 'master' of github.com:vdavy/cover-art

Conflicts:
	src/main/resources/META-INF/spring/generalConfiguration.properties