modified header and footer include file
Git conflict merged in Header.jsp

Merge branch 'master' of https://github.com/Akash147/socionews

Conflicts:
	socio/web/dashboard/header.jsp