homepage panel
Changed to Footheme
homepage panel changes
Merge branch 'master' of github.com:kellyalb/nerdsummit
NERDs 2014 SkyHack theme
Merge branch 'master' of https://github.com/kellyalb/nerdsummit
logo and ss
Merge branch '2014'

Conflicts:
	profiles/cod/themes/contrib/adminimal_theme/css/images/ui-bg_flat_0_aaaaaa_40x100.png
	profiles/cod/themes/contrib/adminimal_theme/css/images/ui-bg_flat_75_ffffff_40x100.png
	profiles/cod/themes/contrib/adminimal_theme/css/images/ui-icons_000000_256x240.png
	profiles/cod/themes/contrib/nerds2014/README.txt
	profiles/cod/themes/contrib/nerds2014/css/images/ui/ui-bg_flat_0_aaaaaa_40x100.png
	profiles/cod/themes/contrib/nerds2014/css/images/ui/ui-bg_flat_75_ffffff_40x100.png
	profiles/cod/themes/contrib/nerds2014/css/images/ui/ui-icons_000000_256x240.png
	profiles/cod/themes/contrib/nerds2014/logo.png
	profiles/cod/themes/contrib/nerds2014/nerds2014.info
	profiles/cod/themes/contrib/nerds2014/screenshot.png
	profiles/cod/themes/contrib/nerds2014/template.php
	profiles/cod/themes/contrib/nerds2014sky/CHANGELOG.txt
	profiles/cod/themes/contrib/nerds2014sky/css/admin-section.css
	profiles/cod/themes/contrib/nerds2014sky/css/articles.css
	profiles/cod/themes/contrib/nerds2014sky/css/blocks.css
	profiles/cod/themes/contrib/nerds2014sky/css/comments.css
	profiles/cod/themes/contrib/nerds2014sky/css/fields.css
	profiles/cod/themes/contrib/nerds2014sky/css/forms.css
	profiles/cod/themes/contrib/nerds2014sky/css/html-elements.css
	profiles/cod/themes/contrib/nerds2014sky/css/images/black.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/dark/arrow-down.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/dark/arrow-right.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/forum-default.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/gray.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/search-button.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ts/arrow-circle.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ts/arrow-double.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ts/arrow-fat.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ts/arrow-head.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ts/arrow-skinny.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ts/dots.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ts/grid.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ts/hatch.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ts/line-horiz.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ts/line-vert.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ui/ui-bg_flat_0_aaaaaa_40x100.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ui/ui-bg_flat_75_ffffff_40x100.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ui/ui-bg_glass_55_fffce5_1x400.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ui/ui-bg_glass_95_fef5f1_1x400.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ui/ui-bg_highlight-soft_50_d6d4d1_1x100.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ui/ui-bg_highlight-soft_90_e6e4e2_1x100.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ui/ui-bg_highlight-soft_90_efedeb_1x100.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ui/ui-icons_000000_256x240.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ui/ui-icons_222222_256x240.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ui/ui-icons_555555_256x240.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ui/ui-icons_884400_256x240.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ui/ui-icons_8c2e0b_256x240.png
	profiles/cod/themes/contrib/nerds2014sky/css/images/ui/ui-icons_999999_256x240.png
	profiles/cod/themes/contrib/nerds2014sky/css/navigation.css
	profiles/cod/themes/contrib/nerds2014sky/css/page.css
	profiles/cod/themes/contrib/nerds2014sky/css/print.css
	profiles/cod/themes/contrib/nerds2014sky/css/responsive.custom.css
	profiles/cod/themes/contrib/nerds2014sky/css/responsive.desktop.css
	profiles/cod/themes/contrib/nerds2014sky/css/responsive.smartphone.landscape.css
	profiles/cod/themes/contrib/nerds2014sky/css/responsive.smartphone.portrait.css
	profiles/cod/themes/contrib/nerds2014sky/css/responsive.tablet.landscape.css
	profiles/cod/themes/contrib/nerds2014sky/css/responsive.tablet.portrait.css
	profiles/cod/themes/contrib/nerds2014sky/css/sky.settings.style.css
	profiles/cod/themes/contrib/nerds2014sky/css/tables.css
	profiles/cod/themes/contrib/nerds2014sky/js/scripts.js
	profiles/cod/themes/contrib/nerds2014sky/templates/comment.tpl.php
	profiles/cod/themes/contrib/nerds2014sky/templates/node.tpl.php
	profiles/cod/themes/contrib/nerds2014sky/templates/page.tpl.php
	profiles/cod/themes/contrib/nerds2014sky/theme-settings.php
not needed
not needed