mono
Merge branch 'master' of https://github.com/holisticware/HolisticWare.PR.DevUG.CKVZ.SlideShow

Conflicts:

2013-05-18/HolisticWare.SlideShow.EXE_ASPnet_MVC4/HolisticWare.SlideShow
.EXE_ASPnet_MVC4.csproj

2013-05-18/HolisticWare.SlideShow.EXE_ASPnet_MVC4/bin/HolisticWare.Slide
Show.EXE_ASPnet_MVC4.dll