Merge remote-tracking branch 'origin/6.0.0-dev'

# Conflicts:
#	pom.xml
#	src/main/java/com/imcode/imcms/config/ApplicationConfig.java
#	src/main/java/com/imcode/imcms/config/DBConfig.java
#	src/main/java/com/imcode/imcms/config/MainConfig.java
#	src/main/java/com/imcode/imcms/config/WebConfig.java
#	src/main/webapp/WEB-INF/jsp/image_archive/pages/add_image.jsp
#	src/main/webapp/WEB-INF/jsp/image_archive/pages/external_files/external_files.jsp
#	src/main/webapp/WEB-INF/jsp/image_archive/pages/fragments/change_data.jsp
#	src/main/webapp/WEB-INF/jsp/image_archive/pages/fragments/jscalendar.jsp
#	src/main/webapp/WEB-INF/jsp/image_archive/pages/image_card/image_card.jsp
#	src/main/webapp/WEB-INF/jsp/image_archive/pages/search_image.jsp
#	src/main/webapp/WEB-INF/jsp/imcms/document_search_terms.jsp
#	src/main/webapp/WEB-INF/tags/imcms/ui/dialog.tag
#	src/main/webapp/WEB-INF/templates/lang/admin/textdoc/imcms_admin_headtag.html

build.properties.template

@@ -14,9 +14,9 @@ server-name = http://localhost:8080
 db-host = localhost
 db-name = imcms
 db-user = root
-db-pass = root
+db-pass =
 db-maxconnections = 20
-hibernate-hbm2ddl-auto =
+hibernate-hbm2ddl-auto = validate
 
 # For MySQL
 db-target = mysql
@@ -110,7 +110,7 @@ documentation-host = http://docs.imcms.net/en/latest/
 # ImageMagick is a software suite for creating, editing and composing images. It can be downloaded from http://www.imagemagick.org.
 # This path should lead to where ImageMagick is installed, and is required only on windows. Use portable version
 # to avoid possible errors. Newer versions works too (latest tested 7.0.2-5).
-# For example: c:/program files/imagemagick-6.4.9-q16
+# For example: C:\\\\Program Files\\\\ImageMagick-6.9.6-Q16
 image-magick-path = 
 
 # Path where all the images that are uploaded to image archive will be stored, can be relative or absolute.
@@ -187,7 +187,14 @@ index-disabled-file-mimes =
 
 # Comma separated list of mime types
 # Since 4.2.4
--index-disabled-file-extensions =
+index-disabled-file-extensions =
 
 # Error logger url.
-error-logger-url =
+error-logger-url =
+
+# Whitelist for tags that could be used in HTML mode of text editor, separated by semicolon, no matter lower- or uppercase
+text.editor.html.tags.whitelist = a;b;blockquote;br;caption;cite;code;col;colgroup;dd;div;dl;dt;em;h1;h2;h3;h4;h5;h6;i;img;li;ol;p;pre;q;small;span;strike;strong;sub;sup;table;tbody;td;tfoot;th;thead;tr;u;ul
+
+
+# current imcms version
+imcms.version = 6.0.0-SNAPSHOT

lombok.config

@@ -0,0 +1,2 @@
+config.stopBubbling = true
+lombok.anyConstructor.suppressConstructorProperties = false

pom-ant.xml

@@ -47,7 +47,6 @@
         <property name="swfpattern" value="**/*.swf"/>
 
         <property name="docs" value="${build.webapp.imcms.dir}/docs"/>
-        <property name="apisamples" value="${docs}/apisamples"/>
         <property name="apidocs" value="${docs}/api"/>
 
         <dependset>
@@ -105,13 +104,6 @@
 
         <mkdir dir="${demotemplates}"/>
 
-        <copy todir="${apisamples}" description="appending .txt on all jsp files making the source browsable">
-            <fileset dir="${apisamples}">
-                <include name="*.jsp"/>
-            </fileset>
-            <mapper type="glob" from="*" to="*.txt"/>
-        </copy>
-
         <copy todir="${docs}">
             <fileset dir="docs"/>
         </copy>