question_id mapping for ruhiira
minor fix on Ruhiira mapping
Merge branch 'master' into ruhiira

Conflicts:
	mvp/models.py
	mvp/static_definitions/question_id_mapping.py
Merge pull request #44 from modilabs/ruhiira

Ruhiira