added caption to news photo using description field and admin option to enable it
Merge branch 'SCHOLAR-3.x' into 6153
reseting to current state of master branch
Merge branch 'SCHOLAR-3.x' into 6153
Merge branch 'SCHOLAR-3.x' into 6153
fixing unintended changes to os_pages files
Merge branch 'SCHOLAR-3.x' into 6153
moved customization of news photo display from template.php to own template #6153
added function_exists call to avoid duplicate function definitions for helper function #6153
Merge branch 'SCHOLAR-3.x' into 6153
removed template file for news caption; added description as caption to os_news_process_node
adjust css to reflect new catpion feature to news images. #6153
fix margin bottom on image wrapper. #6153
fixed code spacing
Merge branch '6153' of github.com:openscholar/openscholar into 6153
Merge branch 'SCHOLAR-3.x' into 6153
fixed more spacing
fixed more spacing and replaced tabs
Merge branch 'SCHOLAR-3.x' into 6153
made requested formatting changes and added use of LANGUAGE_NONE constant