Fireproperty menu

Added property menu and brushed up code
Merge branch 'master' of https://github.com/Cryslo/EMSRisicoStage