AlertTest and UserTest

Tests completed
Merge branch 'master' of https://github.com/Daisuki91/projetpoo2014

Conflicts:
	doc/uml.dia