Victor Algarin 10/06/2014
Merge origin/master
Victor Algarin 10/06/2014
Victor Algarin 11/06/2014
Merge origin/master
Victor Algarin 11/06/2014
Victor Algarin 11/06/2014
Merge origin/master