Update survey form
Small navigation enhancement
Basic structure for auto saving the survey added
manual merge of conflicts
Merge javascript again