Merge branch 'release/2.1.0' into develop
[DSI Releaser] prepare for next development iteration
Updated to the Fenix Framework 2.6.0
Integrating develop into master for the new branching model

  * For reference see https://confluence.fenixedu.org/display/FENIXEDU/Methodology