question render, timer, change section, previous, next, flag, bug fixes
merged conflicts fixes
merge conflicts in nav controller