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

1. emodule-engage
2. Dependent merge proposals