code optimazation in dashboard page and common functions added in common.js
conflicts removed