Started alternative design with nag links in center
Merge branch 'master' into testing

Conflicts:
	app/assets/stylesheets/styles.css.scss
	app/views/companies/show.html.erb
Refactored opportunity files to entry
Add entry_name to entry
Add threats table and Entry constants