start of theme development
insert
Mllerge branch 'master' of https://github.com/tucsonSun/project1

Conflicts:
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/_aui_variables.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/_liferay_custom.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/application.css
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui.css
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_accordion.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_alerts.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_breadcrumbs.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_button-groups-alloy.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_button-groups.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_buttons-alloy.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_buttons.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_carousel-alloy.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_carousel.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_close.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_code.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_component-animations.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_dropdowns.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_forms.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_grid.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_hero-unit.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_labels-badges.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_layouts.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_media.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_mixins.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_modals-alloy.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_modals.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_navbar.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_navs-alloy.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_navs.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_pager.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_pagination-alloy.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_pagination.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_popovers-alloy.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_popovers.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_progress-bars-alloy.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_progress-bars.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_reset.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_responsive-1200px-min.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_responsive-767px-max.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_responsive-768px-979px.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_responsive-navbar.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_responsive-utilities.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_scaffolding.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_sprites.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_tables.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_thumbnails.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_tooltip-alloy.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_tooltip.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_type.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_utilities-alloy.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_utilities.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_variables-alloy.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_variables.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/_wells.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/alloy-font-awesome/font/fontawesome-alloy.dev.svg
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/alloy-font-awesome/font/fontawesome-alloy.svg
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/alloy-font-awesome/font/fontawesome-webfont.svg
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/alloy-font-awesome/scss/_bootstrap.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/alloy-font-awesome/scss/_core.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/alloy-font-awesome/scss/_extras.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/alloy-font-awesome/scss/_icons-alloy-extra.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/alloy-font-awesome/scss/_icons-alloy.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/alloy-font-awesome/scss/_mixins-alloy.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/alloy-font-awesome/scss/_path-alloy.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/alloy-font-awesome/scss/_variables.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/alloy-font-awesome/scss/font-awesome-ie7.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/alloy-font-awesome/scss/font-awesome.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/bootstrap.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/aui/responsive.scss
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/base.css
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/dockbar.css
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/extras.css
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/layout.css
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/main.css
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/navigation.css
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/css/portlet.css
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/images/thumbnail.png
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/js/main.js
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/templates/init_custom.vm
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/templates/navigation.vm
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/templates/portal_normal.vm
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/templates/portal_pop_up.vm
	liferay-plugins-sdk-6.2/themes/shock-baww-theme/docroot/templates/portlet.vm