Fix problem with "Cannot remove the same component twice" error
Merge branch 'development' of https://github.com/engagepoint/labs-questionnaire-wizard into development
Improve RestoreViewListener for new initMenu() method