DDBEASY-158 - Translate string for email description on user edit profile page.
BBDEASY-158 - Fix conflict.
DDBEASY-158 - Move path to easyddb.make file.
Merge branch 'DDBEASY-158' of github.com:easyddb/ding2 into DDBEASY-158
DDBEASY-158 - Remove ding_user from ding2.make file.
Merge branch 'DDBEASY-158' into development