new master splash from #viennacodesprint14
Merge pull request #1276 from anitagraser/master

new master splash from #viennacodesprint14