Committing changes to local files.

Signed-off-by: Harish Patel <harish.patel@vitruviantech.com>
Merge remote-tracking branch 'origin/master'

Signed-off-by: Harish Patel <harish.patel@vitruviantech.com>

Conflicts:
	cache/modules/Emails/language/en_us.lang.php
	custom/modulebuilder/packages/v/manifest.php