Merge remote-tracking branch 'origin/branch-4.5'

Conflicts:
	sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java

diff --cc sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java
index dc88d4323370e7fdee5c0d7113818b2b7119c2d7,8fc1ea23866273d2efc530962f819d6f03b8edb5..0fb1abaa86458f30e0e6bbfa78bf5c74f234be30
--- 1/sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java
--- 2/sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java
@@@ -20,20 -20,19 +20,24 @@@
  package org.sonar.api.web;
  
  import com.google.common.base.Objects;
++<<<<<<< HEAD
 +import org.sonar.api.source.Highlightable;
 +import org.sonar.api.task.TaskExtension;
++=======
+ import org.sonar.api.ServerExtension;
++>>>>>>> origin/branch-4.5
  import org.sonar.colorizer.Tokenizer;
  
  import java.util.List;
  
  /**
 - * Extend the library sonar-colorizer to support new languages. By default only Java sources are colorized in Sonar.
 + * Extend the library sonar-colorizer to support new languages.
   * 
   * @since 1.12
-  * @deprecated since 4.5.2 use {@link Highlightable} API
+  * @deprecated since 4.5.2 use {@link org.sonar.api.source.Highlightable}
   */
  @Deprecated
 -public abstract class CodeColorizerFormat implements ServerExtension {
 +public abstract class CodeColorizerFormat implements TaskExtension {
  
    private String languageKey;