Join with id_exercise
Merge branch 'master' of https://github.com/UOC/Tandem

# By victor
# Via victor
* 'master' of https://github.com/UOC/Tandem:
  Notification email and translations
Missing week field