Merge origin/HISTORY_dev

Conflicts:
	others/db_changes/masterChangelog.xml

others/db_changes/masterChangelog.xml

@@ -4,4 +4,5 @@
     <include file="data/PERS_data.xml"/>
     <include file="struct/create_org.xml"/>
     <include file="data/example_org.xml"/>
+    <include file="struct/create_history.xml"/>
 </databaseChangeLog>

others/db_changes/struct/create_history.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="d.lechner" id="1528461798137-1">
+        <createTable tableName="HISTORY">
+		    <column name="SUBJECT" type="VARCHAR(254)"/>
+            <column name="INFO" type="CLOB"/>
+			<column name="MEDIUM" type="INTEGER"/>
+            <column name="DIRECTION" type="CHAR(1)"/>
+			<column name="ENTRYDATE" type="TIMESTAMP"/>
+			<column name="HISTORYID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_HISTORY_HISTORYID"/>
+            </column>
+			<column name="USER_NEW" type="VARCHAR(50)">
+				<constraints nullable="false"/>
+			</column>
+            <column name="USER_EDIT" type="VARCHAR(50)"/>
+			<column name="DATE_NEW" type="TIMESTAMP">
+				<constraints nullable="false"/>
+			</column>
+            <column name="DATE_EDIT" type="TIMESTAMP"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file