ENYO-2458: drop trace & fix bad conversion of legacy project.json

Enyo-DCO-1.1-Signed-off-by: Francois-Xavier KOWALSKI <francois-xavier.kowalski@hp.com>
ENYO-2501: re-align enyo on enyo/master for ares
Merge pull request #333 from enyojs/ENYO-2458

ENYO-2458: drop trace & fix bad conversion of legacy project.json

Tested on linux chrome 26
Merge pull request #334 from enyojs/ENYO-2501

ENYO-2501: re-align enyo on enyo/master for ares

tested on linux
Merge remote-tracking branch 'upstream/master' into Work