split dictionary into twp dictionaries to allow easy use of template
Merge branch 'master' of https://github.com/freedops/Props_man
Merge branch 'master' of https://github.com/freedops/Props_man