swimmer model, decorator, strategy & helper refactoring, part 2
Merge branch 'master' of https://github.com/steveoro/goggles
merge commit