ENYO-2501: re-align enyo on enyo/master for ares
Merge pull request #334 from enyojs/ENYO-2501

ENYO-2501: re-align enyo on enyo/master for ares

tested on linux