gallery
admin and div changes
Merge remote-tracking branch 'origin/FA_3'

Conflicts:
	themes/lightblue/layout/comment/content.phtml
	themes/lightblue/layout/story/content-home.phtml
	themes/lightblue/layout/story/content.phtml
Merge remote-tracking branch 'origin/BLS_1'