changed measure.type to measure.voting_method
Added Measure.type and Measure.question (Bug #2)