added fail/freeze/recover to server
Merge branch 'master' of https://github.com/JoaoLReis/ProjectoAAJ