Changed messages
Merge branch 'master' of https://github.com/UOC/Tandem

# By Victor
# Via Victor
* 'master' of https://github.com/UOC/Tandem:
  bug fixes