Victor Algarin 14/02/2014
Victor Algarin 14/02/2014
Victor Algarin 17/02/2014 --> EJB
Merge origin/master