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

1. emodule-empris
2. Dependent merge proposals