Merge proposals dependent on lp://staging/~enlightenment-git/enlightenment-svn/terminology-git

1. terminology-git
2. Dependent merge proposals