more updates
Merge branch 'master' of https://github.com/hurdad/enyo-forex