Merge branch 'master' of https://github.com/saurshaz/et-core
Merge branch 'master' into wip
add local changes done to git