committing Saurabh and Rogers changes to et-core files
Merge branch 'devjs' of https://github.com/saurshaz/et-core into devjs