Task #105: Customize add question page
Merge branch '105_2' into dev