done
done
Merge https://github.com/khushbu14/webportal into new3
done
done
done
errors in templates corrected
Merge branch 'master' of https://github.com/khushbu14/webportal into new