Merge commits from 2017 and master

Merge !58 (closed) plus some commits from master and change the version of Phys we depends to (now v25r0) and changed version of Alignment (v12r0)