Add google+ meta tags, updated twitter meta tags
Trying to resolve git merge errors
Merge branch 'master' of https://github.com/Zacc206/CorporateEventsWebApp

Conflicts:
	www/index.html