questions database
Merge branch 'master' of github.com:Babouchot/Conquistador
few fixes