Initial commit
Initial Code commit
Code Cleanup (and makes it compile) Note now requers crafter profile
Branding update
2.2.2-SNAPSHOT
2.2.2-SNAPSHOT
2.2.2-SNAPSHOT
Merge commit '805974d475f46ac50dc92ae1c80b0d0298e5665e'

# By Carlos Ortiz (6) and Sumer Jabri (1)
# Via Carlos Ortiz
* commit '805974d475f46ac50dc92ae1c80b0d0298e5665e':
  2.2.2-SNAPSHOT
  2.2.2-SNAPSHOT
  2.2.2-SNAPSHOT
  Branding update
  Code Cleanup (and makes it compile) Note now requers crafter profile
  Initial Code commit
  Initial commit

Conflicts:
	.gitignore
	README.md
	pom.xml
	src/main/java/org/craftercms/engine/controller/ComponentRenderController.java
	src/main/java/org/craftercms/engine/controller/ErrorPageRenderController.java
	src/main/java/org/craftercms/engine/controller/HttpProxyRequestHandler.java
	src/main/java/org/craftercms/engine/controller/MonitoringController.java
	src/main/java/org/craftercms/engine/controller/PageRenderController.java
	src/main/java/org/craftercms/engine/controller/StaticAssetsRequestHandler.java
	src/main/java/org/craftercms/engine/controller/preview/rest/ProfileRestController.java
	src/main/java/org/craftercms/engine/freemarker/CrafterFreeMarkerConfigurer.java
	src/main/java/org/craftercms/engine/freemarker/CrafterFreeMarkerTemplateLoader.java
	src/main/java/org/craftercms/engine/freemarker/CrafterTemplateExceptionHandler.java
	src/main/java/org/craftercms/engine/freemarker/RenderComponentDirective.java
	src/main/java/org/craftercms/engine/http/impl/DefaultExceptionHandler.java
	src/main/java/org/craftercms/engine/http/impl/HttpStatusCodeExceptionHandler.java
	src/main/java/org/craftercms/engine/http/impl/ViewNotResolvedExceptionHandler.java
	src/main/java/org/craftercms/engine/macro/impl/AbstractMacro.java
	src/main/java/org/craftercms/engine/macro/impl/MacroResolverImpl.java
	src/main/java/org/craftercms/engine/mobile/UserAgent.java
	src/main/java/org/craftercms/engine/mobile/UserAgentTemplateDetector.java
	src/main/java/org/craftercms/engine/model/SiteItem.java
	src/main/java/org/craftercms/engine/service/ContentStoreServiceImpl.java
	src/main/java/org/craftercms/engine/service/PreviewOverlayCallback.java
	src/main/java/org/craftercms/engine/service/SiteItemService.java
	src/main/java/org/craftercms/engine/service/UrlTransformationService.java
	src/main/java/org/craftercms/engine/service/context/SiteContextFactory.java
	src/main/java/org/craftercms/engine/servlet/filter/AbstractSiteContextResolvingFilter.java
	src/main/java/org/craftercms/engine/servlet/filter/SiteContextFromCookieResolvingFilter.java
	src/main/java/org/craftercms/engine/servlet/filter/SiteContextFromDefaultResolvingFilter.java
	src/main/java/org/craftercms/engine/servlet/filter/SiteContextFromRequestUriResolvingFilter.java
	src/main/java/org/craftercms/engine/util/breadcrumb/BreadcrumbBuilder.java
	src/main/java/org/craftercms/engine/view/CrafterPageView.java
	src/main/java/org/craftercms/engine/view/CrafterPageViewResolver.java
	src/main/java/org/craftercms/engine/view/UserAgentAwareCrafterPageView.java
	src/main/java/org/craftercms/engine/view/freemarker/AllHttpScopesAndAppContextHashModel.java
	src/main/java/org/craftercms/engine/view/freemarker/CrafterFreeMarkerView.java
	src/main/java/org/craftercms/engine/view/freemarker/CrafterFreeMarkerViewResolver.java
	src/main/resources/crafter/engine/mode/preview/rendering-context.xml
	src/main/resources/crafter/engine/mode/preview/services-context.xml
	src/main/resources/crafter/engine/rendering/main-rendering-context.xml
	src/main/resources/crafter/engine/rendering/view-context.xml
	src/main/resources/crafter/engine/server-config.properties
	src/main/resources/crafter/engine/services/main-services-context.xml
	src/main/resources/log4j.xml
	src/main/webapp/WEB-INF/templates/system/common/components-support.ftl
	src/main/webapp/WEB-INF/templates/system/common/cstudio-support.ftl
	src/main/webapp/WEB-INF/templates/web/navigation/navigation.ftl
	src/main/webapp/WEB-INF/web.xml
	src/test/resources/log4j.xml