oster/PLM — pull request #195 by Cedric-Huguenin (2014-08-23 16:38:55+00:00)
Title: [Fix] Checkout and pull to retrieve progression. In theory, merge conflict should never happened 

Closes #194