Merge branch 'release/3.6.1' into develop
Bumped version for development after release.
Minor change: removed the hiffen character
Bug fix: implemented missing override method, necessary to generate link
to thesis site
Bug fix: fixed the right if case
Bug fix: recovered correctly this deleted jsp that is still necessary
Bumped version for release of 3.6.2
Merge branch 'release/3.6.2'