update
Merge branch 'master' of https://github.com/ravenfeld/LiveWallpaperSlideshow

Conflicts:
	src/fr/ravenfeld/livewallpaper/slideshow/Renderer.java