Content tag changes
Merge branch 'master' of https://github.com/jiteshd1/320digital

Conflicts:
	header_content.shtml
further header changes