Merge branch 'master' of https://github.com/AngelBerihuete/laeken2
Last changes on server
Added elasticity function