added INOVA logo to SM challenge carousel graphic
Merge pull request #916 from cbare/release-38

added INOVA logo to SM challenge carousel graphic
swc-1320 - heartbleed notification and allow users to delete API key
Merge pull request #917 from dburdick/swc-1320

swc-1320 - heartbleed notification and allow users to delete API key
Merge pull request #918 from dburdick/develop

swc-1320 - heartbleed notification and allow users to delete API key
Merge branch 'release-38' into develop

Conflicts:
	src/main/webapp/images/spotlight/Dream85_SM.jpg
swc-1323 - table status refactor