Conflicts:
	README.txt
	acquia_marina.info
	skins/acquia_marina_default/acquia_marina_default.inc

Cleanup to skin syntax, reorganized skin UI elements and categorizes, restricted certain skins only to blocks.

removed background  from #comments .block-icon in fusion-acquia-marina-style.css, as it should not have been there to begin with.

added more descriptive title to gray search box skin. cleaned up line spacing in acquia_marina_default.css file but did not change any css in this file

Issue#1159394 by goody815, aquariumtap: implemented aquariumtap's patch to fix the gutter issue between sidebar and main content area.

#748512 by eternalistic, jayperkor: Primary menu background images now have transparent background for rounded corners.
#691860 by eternalistic, anotheraviator: Fixed the block titles with rounded corners and backgrounds displaying outside of the container area.
#843846 by eternalistic: Changed the way the icons are displayed in the block title area so it doesn't render dead spots should a link be present.
#678418 by eternalistic: Since the block icons are loaded differently now this issue has been resolved.
#851744 by eternalistic: Green arrow icons are now added to list items as backgrounds rather than "list-style" so it works better in more instances.
#898730 by eternalistic: Flag icon has been corrected as it wasn't loading correctly. It is now a Skinr option and loads the flag icon when chosen.
#902212 by eternalistic, zet: Added styling to Drupal update table.
#851722 by eternalistic, Francis Yip: Updated hover and dropdowns primary menu in IE7.
#685472 by eternalistic: Updated block icon positioning for RTL languages.

Added support for Panels and Skinr integration and some minor fixes to invalid code in page.tpl.php and other styling fixes.