tour/questionset modifications - in progress
add tour - in progress - merge fix