added generic sets and maps with useful functions
Merge branch 'master' of https://github.com/aeolus-project/zephyrus