fix the basket merging when the training's trainer and client is equals
Merge branch 'master' of https://github.com/adamszabo/fitty
fix the show of the merge dialog