adjusted asciiguide and bootstrap conf files
Merge branch 'prod' into JIRA-GWEB-226

Conflicts:
	content/styles/nav.css
updated asciiguide and conf file
prioritized issues in asciiguide file
adjusted asciiguide
fixed blockquotes and adjusted table styling
Merge branch 'JIRA-GWEB-226'