fix configuration bugs
Merge branch 'dev' of github.com:anaderi/FairSoft into dev