Merge branch 'master' of https://github.com/stefan-buchholtz/slideshow

Conflicts:

SlideShow.xcodeproj/project.xcworkspace/xcuserdata/einstein.xcuserdatad/
UserInterfaceState.xcuserstate

SlideShow.xcodeproj/xcuserdata/einstein.xcuserdatad/xcdebugger/Breakpoin
ts_v2.xcbkptlist
Konflikte beseitigt
Merge branch 'master' of https://github.com/stefan-buchholtz/slideshow

Conflicts:

SlideShow.xcodeproj/project.xcworkspace/xcuserdata/einstein.xcuserdatad/
UserInterfaceState.xcuserstate

SlideShow.xcodeproj/xcuserdata/einstein.xcuserdatad/xcdebugger/Breakpoin
ts_v2.xcbkptlist
	SlideShow/ImageBrowser/SSImageBrowserItem.m