updated configuration
Merge branch 'master' of https://github.com/luca91/EMS.git