fix for tab and block edit issue
Merge branch 'master' of https://github.com/shashin62/psadmin