updating the default, and override features
Merge branch 'master' of https://github.com/saurshaz/et-core