-some changes on how we pass from one screen to another.
Merge branch 'master' of https://github.com/apic6/MELT.git
Marker changes
Revert "Marker changes"

This reverts commit e1833a417be02244782678c38ca0b5002cd51253.
Marker changes
Merge branch 'master' of https://github.com/apic6/MELT
Marker changes