Fix Merge branch 'master' of http://github.com/SubhashCBS/edotdemo
Fix
Merge branch 'master' of http://github.com/SubhashCBS/edotdemo

SubhashCBS/edotdemo,SubhashCBS/edotdemo,SubhashCBS/edotdemo,SubhashCBS/edotdemo,SubhashCBS/edotdemo,SubhashCBS/edotdemo