.
Merge branch 'merged-repo' of https://github.com/edge226/lucid.git into merged-repo
to much additions for core from extra and comm