update
Merge branch 'master' of https://github.com/marcelwidmer/ch.keepcalm.samples.git