Merge branch 'develop'

* develop:
  Modifications required in order to build MAF2Medical with Visual Studio 2013, specifically:
nothing, only for testing jenkins syncro