generic refactoring - do not clutter controllers with E constants
docUpdates
smallFixes
Merge branch 'master' of github.com:espresso/espresso
Merge branch 'master' of github.com:espresso/espresso
generic refactoring