Merge branch 'master' of https://github.com/enyojs/ares-project.git into work2
Merge branch 'work2' of https://github.com/micro-tech/ares-project