Merge branch 'master' into comparison_dashboard_changes

Conflicts:
	tests/PHPUnit/UI

9 files changed, 0 insertions, 1718 deletions

diff --git a/misc/others/crossdomain.xml b/misc/others/crossdomain.xml
deleted file mode 100644
index d9d29cc4f2..0000000000
--- a/misc/others/crossdomain.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE cross-domain-policy SYSTEM "http://www.macromedia.com/xml/dtds/cross-domain-policy.dtd">
-<cross-domain-policy>
-	<allow-access-from domain="*.piwik.org" />
-</cross-domain-policy>
diff --git a/misc/others/db-schema-README b/misc/others/db-schema-README
deleted file mode 100644
index 965b89afb0..0000000000
--- a/misc/others/db-schema-README
+++ /dev/null
@@ -1,14 +0,0 @@
-Schema edited with DBDESIGNER
-=============================
-
---> Official documentation on http://dev.piwik.org/trac/wiki/DatabaseSchema <--
-
-
-DBdesigner is a great tool for designing Database schema, generating the SQL associated, 
-and editing beautiful database schema images so that you're proud and happy to show your
- design to your fellow developer friends.
-
-  How to install DBDesigner on Linux
-  http://noteplog.com/how-to-install-dbdesigner-on-linux/
-  
-  Also available for windows
diff --git a/misc/others/db-schema.png b/misc/others/db-schema.png
deleted file mode 100644
index 709a5b1680..0000000000
--- a/misc/others/db-schema.png
+++ /dev/null
diff --git a/misc/others/db-schema.xml b/misc/others/db-schema.xml
deleted file mode 100644
index e99c25891c..0000000000
--- a/misc/others/db-schema.xml
+++ /dev/null
@@ -1,1612 +0,0 @@
-<?xml version="1.0" standalone="yes" ?>
-<DBMODEL Version="4.0">
-	<SETTINGS>
-		<GLOBALSETTINGS ModelName="db-schema" IDModel="0" IDVersion="0"
-			VersionStr="1.0.0.0" Comments="" UseVersionHistroy="1"
-			AutoIncVersion="1" DatabaseType="MySQL" ZoomFac="80.00" XPos="0"
-			YPos="0" DefaultDataType="5" DefaultTablePrefix="0" DefSaveDBConn=""
-			DefSyncDBConn="" DefQueryDBConn="" Printer="" HPageCount="4.0"
-			PageAspectRatio="1.440892512336408" PageOrientation="1"
-			PageFormat="A4 (210x297 mm, 8.26x11.7 inches)" SelectedPages=""
-			UsePositionGrid="0" PositionGridX="20" PositionGridY="20"
-			TableNameInRefs="0" DefaultTableType="0"
-			ActivateRefDefForNewRelations="1" FKPrefix="" FKPostfix=""
-			CreateFKRefDefIndex="0" DBQuoteCharacter="`"
-			CreateSQLforLinkedObjects="0" DefModelFont="Tahoma"
-			CanvasWidth="4096" CanvasHeight="2842" />
-		<DATATYPEGROUPS>
-			<DATATYPEGROUP Name="Numeric Types" Icon="1" />
-			<DATATYPEGROUP Name="Date and Time Types" Icon="2" />
-			<DATATYPEGROUP Name="String Types" Icon="3" />
-			<DATATYPEGROUP Name="Blob and Text Types" Icon="4" />
-			<DATATYPEGROUP Name="User defined Types" Icon="5" />
-			<DATATYPEGROUP Name="Geographic Types" Icon="6" />
-		</DATATYPEGROUPS>
-		<DATATYPES>
-			<DATATYPE ID="1" IDGroup="0" TypeName="TINYINT"
-				Description="A very small integer. The signed range is -128 to 127. The unsigned range is 0 to 255."
-				ParamCount="1" OptionCount="2" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="UNSIGNED" Default="1" />
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="2" IDGroup="0" TypeName="SMALLINT"
-				Description="A small integer. The signed range is -32768 to 32767. The unsigned range is 0 to 65535."
-				ParamCount="1" OptionCount="2" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="UNSIGNED" Default="1" />
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="3" IDGroup="0" TypeName="MEDIUMINT"
-				Description="A medium-size integer. The signed range is -8388608 to 8388607. The unsigned range is 0 to 16777215."
-				ParamCount="1" OptionCount="2" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="UNSIGNED" Default="1" />
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="4" IDGroup="0" TypeName="INT"
-				Description="A normal-size integer. The signed range is -2147483648 to 2147483647. The unsigned range is 0 to 4294967295."
-				ParamCount="1" OptionCount="2" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="1" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="UNSIGNED" Default="0" />
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="5" IDGroup="0" TypeName="INTEGER"
-				Description="A normal-size integer. The signed range is -2147483648 to 2147483647. The unsigned range is 0 to 4294967295."
-				ParamCount="1" OptionCount="2" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="1" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="UNSIGNED" Default="1" />
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="6" IDGroup="0" TypeName="BIGINT"
-				Description="A large integer. The signed range is -9223372036854775808 to 9223372036854775807. The unsigned range is 0 to 18446744073709551615."
-				ParamCount="1" OptionCount="2" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="UNSIGNED" Default="0" />
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="7" IDGroup="0" TypeName="FLOAT"
-				Description="A small (single-precision) floating-point number. Cannot be unsigned. Allowable values are -3.402823466E+38 to -1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38."
-				ParamCount="1" OptionCount="1" ParamRequired="1"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="precision" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="8" IDGroup="0" TypeName="FLOAT"
-				Description="A small (single-precision) floating-point number. Cannot be unsigned. Allowable values are -3.402823466E+38 to -1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38."
-				ParamCount="2" OptionCount="1" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-					<PARAM Name="decimals" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="9" IDGroup="0" TypeName="DOUBLE"
-				Description="A normal-size (double-precision) floating-point number. Cannot be unsigned. Allowable values are -1.7976931348623157E+308 to -2.2250738585072014E-308, 0, and 2.2250738585072014E-308 to 1.7976931348623157E+308."
-				ParamCount="2" OptionCount="1" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="2" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-					<PARAM Name="decimals" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="10" IDGroup="0" TypeName="DOUBLE PRECISION"
-				Description="This is a synonym for DOUBLE." ParamCount="2"
-				OptionCount="1" ParamRequired="0" EditParamsAsString="0"
-				SynonymGroup="2" PhysicalMapping="0" PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-					<PARAM Name="decimals" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="11" IDGroup="0" TypeName="REAL"
-				Description="This is a synonym for DOUBLE." ParamCount="2"
-				OptionCount="1" ParamRequired="0" EditParamsAsString="0"
-				SynonymGroup="2" PhysicalMapping="0" PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-					<PARAM Name="decimals" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="12" IDGroup="0" TypeName="DECIMAL"
-				Description="An unpacked floating-point number. Cannot be unsigned. Behaves like a CHAR column."
-				ParamCount="2" OptionCount="1" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="3" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-					<PARAM Name="decimals" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="13" IDGroup="0" TypeName="NUMERIC"
-				Description="This is a synonym for DECIMAL." ParamCount="2"
-				OptionCount="1" ParamRequired="1" EditParamsAsString="0"
-				SynonymGroup="3" PhysicalMapping="0" PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-					<PARAM Name="decimals" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="ZEROFILL" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="14" IDGroup="1" TypeName="DATE"
-				Description="A date. The supported range is \a1000-01-01\a to \a9999-12-31\a."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="15" IDGroup="1" TypeName="DATETIME"
-				Description="A date and time combination. The supported range is \a1000-01-01 00:00:00\a to \a9999-12-31 23:59:59\a."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="16" IDGroup="1" TypeName="TIMESTAMP"
-				Description="A timestamp. The range is \a1970-01-01 00:00:00\a to sometime in the year 2037. The length can be 14 (or missing), 12, 10, 8, 6, 4, or 2 representing YYYYMMDDHHMMSS, ... , YYYYMMDD, ... , YY formats."
-				ParamCount="1" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-				</PARAMS>
-			</DATATYPE>
-			<DATATYPE ID="17" IDGroup="1" TypeName="TIME"
-				Description="A time. The range is \a-838:59:59\a to \a838:59:59\a."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="18" IDGroup="1" TypeName="YEAR"
-				Description="A year in 2- or 4-digit format (default is 4-digit)."
-				ParamCount="1" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-				</PARAMS>
-			</DATATYPE>
-			<DATATYPE ID="19" IDGroup="2" TypeName="CHAR"
-				Description="A fixed-length string (1 to 255 characters) that is always right-padded with spaces to the specified length when stored. values are sorted and compared in case-insensitive fashion according to the default character set unless the BINARY keyword is given."
-				ParamCount="1" OptionCount="1" ParamRequired="1"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="BINARY" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="20" IDGroup="2" TypeName="VARCHAR"
-				Description="A variable-length string (1 to 255 characters). Values are sorted and compared in case-sensitive fashion unless the BINARY keyword is given."
-				ParamCount="1" OptionCount="1" ParamRequired="1"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="length" />
-				</PARAMS>
-				<OPTIONS>
-					<OPTION Name="BINARY" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="21" IDGroup="2" TypeName="BIT"
-				Description="This is a synonym for CHAR(1)." ParamCount="0"
-				OptionCount="0" ParamRequired="0" EditParamsAsString="0"
-				SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="22" IDGroup="2" TypeName="BOOL"
-				Description="This is a synonym for CHAR(1)." ParamCount="0"
-				OptionCount="0" ParamRequired="0" EditParamsAsString="0"
-				SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="23" IDGroup="3" TypeName="TINYBLOB"
-				Description="A column maximum length of 255 (2^8 - 1) characters. Values are sorted and compared in case-sensitive fashion."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="24" IDGroup="3" TypeName="BLOB"
-				Description="A column maximum length of 65535 (2^16 - 1) characters. Values are sorted and compared in case-sensitive fashion."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="25" IDGroup="3" TypeName="MEDIUMBLOB"
-				Description="A column maximum length of 16777215 (2^24 - 1) characters. Values are sorted and compared in case-sensitive fashion."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="26" IDGroup="3" TypeName="LONGBLOB"
-				Description="A column maximum length of 4294967295 (2^32 - 1) characters. Values are sorted and compared in case-sensitive fashion."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="27" IDGroup="3" TypeName="TINYTEXT"
-				Description="A column maximum length of 255 (2^8 - 1) characters."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="28" IDGroup="3" TypeName="TEXT"
-				Description="A column maximum length of 65535 (2^16 - 1) characters."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="29" IDGroup="3" TypeName="MEDIUMTEXT"
-				Description="A column maximum length of 16777215 (2^24 - 1) characters."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="30" IDGroup="3" TypeName="LONGTEXT"
-				Description="A column maximum length of 4294967295 (2^32 - 1) characters."
-				ParamCount="0" OptionCount="0" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="31" IDGroup="3" TypeName="ENUM"
-				Description="An enumeration. A string object that can have only one value, chosen from the list of values."
-				ParamCount="1" OptionCount="0" ParamRequired="1"
-				EditParamsAsString="1" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="values" />
-				</PARAMS>
-			</DATATYPE>
-			<DATATYPE ID="32" IDGroup="3" TypeName="SET"
-				Description="A set. A string object that can have zero or more values, each of which must be chosen from the list of values."
-				ParamCount="1" OptionCount="0" ParamRequired="1"
-				EditParamsAsString="1" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<PARAMS>
-					<PARAM Name="values" />
-				</PARAMS>
-			</DATATYPE>
-			<DATATYPE ID="33" IDGroup="4" TypeName="Varchar(20)"
-				Description="" ParamCount="0" OptionCount="1" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<OPTIONS>
-					<OPTION Name="BINARY" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="34" IDGroup="4" TypeName="Varchar(45)"
-				Description="" ParamCount="0" OptionCount="1" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<OPTIONS>
-					<OPTION Name="BINARY" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="35" IDGroup="4" TypeName="Varchar(255)"
-				Description="" ParamCount="0" OptionCount="1" ParamRequired="0"
-				EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0"
-				PhysicalTypeName="">
-				<OPTIONS>
-					<OPTION Name="BINARY" Default="0" />
-				</OPTIONS>
-			</DATATYPE>
-			<DATATYPE ID="36" IDGroup="5" TypeName="GEOMETRY"
-				Description="Geographic Datatype" ParamCount="0" OptionCount="0"
-				ParamRequired="0" EditParamsAsString="0" SynonymGroup="0"
-				PhysicalMapping="0" PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="38" IDGroup="5" TypeName="LINESTRING"
-				Description="Geographic Datatype" ParamCount="0" OptionCount="0"
-				ParamRequired="0" EditParamsAsString="0" SynonymGroup="0"
-				PhysicalMapping="0" PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="39" IDGroup="5" TypeName="POLYGON"
-				Description="Geographic Datatype" ParamCount="0" OptionCount="0"
-				ParamRequired="0" EditParamsAsString="0" SynonymGroup="0"
-				PhysicalMapping="0" PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="40" IDGroup="5" TypeName="MULTIPOINT"
-				Description="Geographic Datatype" ParamCount="0" OptionCount="0"
-				ParamRequired="0" EditParamsAsString="0" SynonymGroup="0"
-				PhysicalMapping="0" PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="41" IDGroup="5" TypeName="MULTILINESTRING"
-				Description="Geographic Datatype" ParamCount="0" OptionCount="0"
-				ParamRequired="0" EditParamsAsString="0" SynonymGroup="0"
-				PhysicalMapping="0" PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="42" IDGroup="5" TypeName="MULTIPOLYGON"
-				Description="Geographic Datatype" ParamCount="0" OptionCount="0"
-				ParamRequired="0" EditParamsAsString="0" SynonymGroup="0"
-				PhysicalMapping="0" PhysicalTypeName="">
-			</DATATYPE>
-			<DATATYPE ID="43" IDGroup="5" TypeName="GEOMETRYCOLLECTION"
-				Description="Geographic Datatype" ParamCount="0" OptionCount="0"
-				ParamRequired="0" EditParamsAsString="0" SynonymGroup="0"
-				PhysicalMapping="0" PhysicalTypeName="">
-			</DATATYPE>
-		</DATATYPES>
-		<COMMON_DATATYPES>
-			<COMMON_DATATYPE ID="5" />
-			<COMMON_DATATYPE ID="8" />
-			<COMMON_DATATYPE ID="20" />
-			<COMMON_DATATYPE ID="15" />
-			<COMMON_DATATYPE ID="22" />
-			<COMMON_DATATYPE ID="28" />
-			<COMMON_DATATYPE ID="26" />
-			<COMMON_DATATYPE ID="33" />
-			<COMMON_DATATYPE ID="34" />
-			<COMMON_DATATYPE ID="35" />
-		</COMMON_DATATYPES>
-		<TABLEPREFIXES>
-			<TABLEPREFIX Name="Default (no prefix)" />
-		</TABLEPREFIXES>
-		<REGIONCOLORS>
-			<REGIONCOLOR Color="Red=#FFEEEC" />
-			<REGIONCOLOR Color="Yellow=#FEFDED" />
-			<REGIONCOLOR Color="Green=#EAFFE5" />
-			<REGIONCOLOR Color="Cyan=#ECFDFF" />
-			<REGIONCOLOR Color="Blue=#F0F1FE" />
-			<REGIONCOLOR Color="Magenta=#FFEBFA" />
-		</REGIONCOLORS>
-		<POSITIONMARKERS>
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-			<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-		</POSITIONMARKERS>
-	</SETTINGS>
-	<METADATA>
-		<REGIONS>
-			<REGION ID="2956" RegionName="Debug / Info log" XPos="23"
-				YPos="601" Width="750" Height="280" RegionColor="0" TablePrefix="0"
-				TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0"
-				Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1"
-				OrderPos="21" />
-			<REGION ID="2955" RegionName="Statistics logger" XPos="838"
-				YPos="25" Width="582" Height="650" RegionColor="4" TablePrefix="0"
-				TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0"
-				Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1"
-				OrderPos="20" />
-			<REGION ID="2954" RegionName="SQL query profiling"
-				XPos="800" YPos="700" Width="233" Height="181" RegionColor="3"
-				TablePrefix="0" TableType="0" OverwriteTablePrefix="0"
-				OverwriteTableType="0" Comments="" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="19" />
-			<REGION ID="2953" RegionName="Users \+ Permissions"
-				XPos="533" YPos="33" Width="264" Height="331" RegionColor="2"
-				TablePrefix="0" TableType="0" OverwriteTablePrefix="0"
-				OverwriteTableType="0" Comments="" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="18" />
-			<REGION ID="2952" RegionName="Archived data" XPos="25"
-				YPos="28" Width="301" Height="484" RegionColor="1" TablePrefix="0"
-				TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0"
-				Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1"
-				OrderPos="17" />
-			<REGION ID="2949" RegionName="Site" XPos="368" YPos="387"
-				Width="451" Height="161" RegionColor="0" TablePrefix="0"
-				TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0"
-				Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1"
-				OrderPos="18" />
-		</REGIONS>
-		<TABLES>
-			<TABLE ID="2797" Tablename="piwik_access" PrevTableName=""
-				XPos="581" YPos="282" TableType="0" TablePrefix="0" nmTable="0"
-				Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="2">
-				<COLUMNS>
-					<COLUMN ID="2813" ColName="login" PrevColName=""
-						Pos="1" idDatatype="20" DatatypeParams="(20)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2814" ColName="idsite" PrevColName=""
-						Pos="2" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2815" ColName="access" PrevColName=""
-						Pos="3" idDatatype="20" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<RELATIONS_END>
-					<RELATION_END ID="2959" />
-				</RELATIONS_END>
-				<INDICES>
-					<INDEX ID="2816" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2813"
-								LengthParam="0" />
-							<INDEXCOLUMN idColumn="2814"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2799" Tablename="piwik_archive_blob_YEAR_MONTH"
-				PrevTableName="piwik_archive_blob_2008_01" XPos="52" YPos="106"
-				TableType="0" TablePrefix="0" nmTable="0" Temporary="0"
-				UseStandardInserts="0" StandardInserts="\n"
-				TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n"
-				Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1"
-				Obj_id_Linked="-1" OrderPos="4">
-				<COLUMNS>
-					<COLUMN ID="2826" ColName="idarchive" PrevColName=""
-						Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2827" ColName="name" PrevColName=""
-						Pos="2" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2828" ColName="idsite" PrevColName=""
-						Pos="3" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2829" ColName="date1" PrevColName=""
-						Pos="4" idDatatype="14" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2830" ColName="date2" PrevColName=""
-						Pos="5" idDatatype="14" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2831" ColName="period" PrevColName=""
-						Pos="6" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2832" ColName="ts_archived"
-						PrevColName="" Pos="7" idDatatype="15" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2833" ColName="value" PrevColName=""
-						Pos="8" idDatatype="24" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<INDICES>
-					<INDEX ID="2834" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2826"
-								LengthParam="0" />
-							<INDEXCOLUMN idColumn="2827"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2801"
-				Tablename="piwik_archive_numeric_YEAR_MONTH"
-				PrevTableName="piwik_archive_numeric_2008_01" XPos="43" YPos="294"
-				TableType="0" TablePrefix="0" nmTable="0" Temporary="0"
-				UseStandardInserts="0" StandardInserts="\n"
-				TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n"
-				Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1"
-				Obj_id_Linked="-1" OrderPos="6">
-				<COLUMNS>
-					<COLUMN ID="2844" ColName="idarchive" PrevColName=""
-						Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2845" ColName="name" PrevColName=""
-						Pos="2" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2846" ColName="idsite" PrevColName=""
-						Pos="3" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2847" ColName="date1" PrevColName=""
-						Pos="4" idDatatype="14" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2848" ColName="date2" PrevColName=""
-						Pos="5" idDatatype="14" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2849" ColName="period" PrevColName=""
-						Pos="6" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2850" ColName="ts_archived"
-						PrevColName="" Pos="7" idDatatype="15" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2851" ColName="value" PrevColName=""
-						Pos="8" idDatatype="7" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<INDICES>
-					<INDEX ID="2852" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2844"
-								LengthParam="0" />
-							<INDEXCOLUMN idColumn="2845"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2802" Tablename="piwik_log_action"
-				PrevTableName="" XPos="946" YPos="296" TableType="0" TablePrefix="0"
-				nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="7">
-				<COLUMNS>
-					<COLUMN ID="2853" ColName="idaction" PrevColName=""
-						Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2854" ColName="name" PrevColName=""
-						Pos="2" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2855" ColName="type" PrevColName=""
-						Pos="3" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<RELATIONS_START>
-					<RELATION_START ID="2966" />
-					<RELATION_START ID="2967" />
-				</RELATIONS_START>
-				<INDICES>
-					<INDEX ID="2856" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2853"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2803" Tablename="piwik_log_link_visit_action"
-				PrevTableName="" XPos="862" YPos="442" TableType="0" TablePrefix="0"
-				nmTable="0" Temporary="0" UseStandardInserts="0"
-				StandardInserts="\n"
-				TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n"
-				Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1"
-				Obj_id_Linked="-1" OrderPos="8">
-				<COLUMNS>
-					<COLUMN ID="2857" ColName="idlink_va" PrevColName=""
-						Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2858" ColName="idvisit" PrevColName=""
-						Pos="2" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2859" ColName="idaction" PrevColName=""
-						Pos="3" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2860" ColName="idaction_ref"
-						PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(10)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="1" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2861" ColName="time_spent_ref_action"
-						PrevColName="" Pos="5" idDatatype="5" DatatypeParams="(10)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<RELATIONS_END>
-					<RELATION_END ID="2962" />
-					<RELATION_END ID="2966" />
-					<RELATION_END ID="2967" />
-				</RELATIONS_END>
-				<INDICES>
-					<INDEX ID="2862" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2857"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2804" Tablename="piwik_log_profiling"
-				PrevTableName="" XPos="843" YPos="754" TableType="0" TablePrefix="0"
-				nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="9">
-				<COLUMNS>
-					<COLUMN ID="2863" ColName="query" PrevColName=""
-						Pos="1" idDatatype="28" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2864" ColName="count" PrevColName=""
-						Pos="2" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2865" ColName="sum_time_ms"
-						PrevColName="" Pos="3" idDatatype="7" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<INDICES>
-					<INDEX ID="2866" IndexName="query" IndexKind="1"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2863"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2805" Tablename="piwik_log_visit"
-				PrevTableName="" XPos="1146" YPos="43" TableType="0" TablePrefix="0"
-				nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="10">
-				<COLUMNS>
-					<COLUMN ID="2867" ColName="idvisit" PrevColName=""
-						Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2868" ColName="idsite" PrevColName=""
-						Pos="2" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2869" ColName="visitor_localtime"
-						PrevColName="" Pos="3" idDatatype="17" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2870" ColName="visitor_idcookie"
-						PrevColName="" Pos="4" idDatatype="19" DatatypeParams="(32)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2871" ColName="visitor_returning"
-						PrevColName="" Pos="5" idDatatype="1" DatatypeParams="(1)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2872" ColName="visit_first_action_time"
-						PrevColName="" Pos="6" idDatatype="15" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2873" ColName="visit_last_action_time"
-						PrevColName="" Pos="7" idDatatype="15" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2874" ColName="visit_server_date"
-						PrevColName="" Pos="8" idDatatype="14" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2875" ColName="visit_exit_idaction"
-						PrevColName="" Pos="9" idDatatype="5" DatatypeParams="(11)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2876" ColName="visit_entry_idaction"
-						PrevColName="" Pos="10" idDatatype="5" DatatypeParams="(11)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2877" ColName="visit_total_actions"
-						PrevColName="" Pos="11" idDatatype="2" DatatypeParams="(5)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2878" ColName="visit_total_time"
-						PrevColName="" Pos="12" idDatatype="2" DatatypeParams="(5)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2879" ColName="referer_type"
-						PrevColName="" Pos="13" idDatatype="5" DatatypeParams="(10)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2880" ColName="referer_name"
-						PrevColName="" Pos="14" idDatatype="20" DatatypeParams="(70)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2881" ColName="referer_url"
-						PrevColName="" Pos="15" idDatatype="28" DatatypeParams=""
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2882" ColName="referer_keyword"
-						PrevColName="" Pos="16" idDatatype="20" DatatypeParams="(255)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2883" ColName="config_md5config"
-						PrevColName="" Pos="17" idDatatype="19" DatatypeParams="(32)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2884" ColName="config_os" PrevColName=""
-						Pos="18" idDatatype="19" DatatypeParams="(3)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2885" ColName="config_browser_name"
-						PrevColName="" Pos="19" idDatatype="20" DatatypeParams="(10)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2886" ColName="config_browser_version"
-						PrevColName="" Pos="20" idDatatype="20" DatatypeParams="(20)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2887" ColName="config_resolution"
-						PrevColName="" Pos="21" idDatatype="20" DatatypeParams="(9)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2888" ColName="config_color_depth"
-						PrevColName="" Pos="22" idDatatype="1" DatatypeParams="(2)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2889" ColName="config_pdf"
-						PrevColName="" Pos="23" idDatatype="1" DatatypeParams="(1)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2890" ColName="config_flash"
-						PrevColName="" Pos="24" idDatatype="1" DatatypeParams="(1)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2891" ColName="config_java"
-						PrevColName="" Pos="25" idDatatype="1" DatatypeParams="(1)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2892" ColName="config_director"
-						PrevColName="" Pos="26" idDatatype="1" DatatypeParams="(1)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2893" ColName="config_quicktime"
-						PrevColName="" Pos="27" idDatatype="1" DatatypeParams="(1)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2894" ColName="config_realplayer"
-						PrevColName="" Pos="28" idDatatype="1" DatatypeParams="(1)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2895" ColName="config_windowsmedia"
-						PrevColName="" Pos="29" idDatatype="1" DatatypeParams="(1)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2896" ColName="config_cookie"
-						PrevColName="" Pos="30" idDatatype="1" DatatypeParams="(1)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2897" ColName="location_ip"
-						PrevColName="" Pos="31" idDatatype="6" DatatypeParams="(11)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2898" ColName="location_browser_lang"
-						PrevColName="" Pos="32" idDatatype="20" DatatypeParams="(20)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2899" ColName="location_country"
-						PrevColName="" Pos="33" idDatatype="19" DatatypeParams="(3)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2901" ColName="location_provider"
-						PrevColName="" Pos="35" idDatatype="20" DatatypeParams="(100)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<RELATIONS_START>
-					<RELATION_START ID="2962" />
-				</RELATIONS_START>
-				<INDICES>
-					<INDEX ID="2902" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2867"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2806" Tablename="piwik_logger_api_call"
-				PrevTableName="" XPos="474" YPos="637" TableType="0" TablePrefix="0"
-				nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="11">
-				<COLUMNS>
-					<COLUMN ID="2903" ColName="idlogger_api_call"
-						PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)"
-						Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2904" ColName="class_name"
-						PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(255)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2905" ColName="method_name"
-						PrevColName="" Pos="3" idDatatype="20" DatatypeParams="(255)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2906"
-						ColName="parameter_names_default_values" PrevColName="" Pos="4"
-						idDatatype="27" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2907" ColName="parameter_values"
-						PrevColName="" Pos="5" idDatatype="27" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2908" ColName="execution_time"
-						PrevColName="" Pos="6" idDatatype="7" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2909" ColName="caller_ip" PrevColName=""
-						Pos="7" idDatatype="6" DatatypeParams="(20)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2910" ColName="timestamp" PrevColName=""
-						Pos="8" idDatatype="16" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2911" ColName="returned_value"
-						PrevColName="" Pos="9" idDatatype="27" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<INDICES>
-					<INDEX ID="2912" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2903"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2807" Tablename="piwik_logger_error"
-				PrevTableName="" XPos="38" YPos="683" TableType="0" TablePrefix="0"
-				nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="12">
-				<COLUMNS>
-					<COLUMN ID="2913" ColName="idlogger_error"
-						PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)"
-						Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2914" ColName="timestamp" PrevColName=""
-						Pos="2" idDatatype="16" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2915" ColName="message" PrevColName=""
-						Pos="3" idDatatype="27" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2916" ColName="errno" PrevColName=""
-						Pos="4" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2917" ColName="errline" PrevColName=""
-						Pos="5" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2918" ColName="errfile" PrevColName=""
-						Pos="6" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2919" ColName="backtrace" PrevColName=""
-						Pos="7" idDatatype="28" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<INDICES>
-					<INDEX ID="2920" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2913"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2808" Tablename="piwik_logger_exception"
-				PrevTableName="" XPos="246" YPos="722" TableType="0" TablePrefix="0"
-				nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="13">
-				<COLUMNS>
-					<COLUMN ID="2921" ColName="idlogger_exception"
-						PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)"
-						Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2922" ColName="timestamp" PrevColName=""
-						Pos="2" idDatatype="16" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2923" ColName="message" PrevColName=""
-						Pos="3" idDatatype="27" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2924" ColName="errno" PrevColName=""
-						Pos="4" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2925" ColName="errline" PrevColName=""
-						Pos="5" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2926" ColName="errfile" PrevColName=""
-						Pos="6" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2927" ColName="backtrace" PrevColName=""
-						Pos="7" idDatatype="28" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<INDICES>
-					<INDEX ID="2928" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2921"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2809" Tablename="piwik_logger_message"
-				PrevTableName="" XPos="254" YPos="632" TableType="0" TablePrefix="0"
-				nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="14">
-				<COLUMNS>
-					<COLUMN ID="2929" ColName="idlogger_message"
-						PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)"
-						Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2930" ColName="timestamp" PrevColName=""
-						Pos="2" idDatatype="16" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2931" ColName="message" PrevColName=""
-						Pos="3" idDatatype="27" DatatypeParams="" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<INDICES>
-					<INDEX ID="2932" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2929"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2810" Tablename="piwik_site" PrevTableName=""
-				XPos="379" YPos="430" TableType="0" TablePrefix="0" nmTable="0"
-				Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="15">
-				<COLUMNS>
-					<COLUMN ID="2933" ColName="idsite" PrevColName=""
-						Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2934" ColName="name" PrevColName=""
-						Pos="2" idDatatype="20" DatatypeParams="(90)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2935" ColName="main_url" PrevColName=""
-						Pos="3" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2936" ColName="ts_created"
-						PrevColName="" Pos="4" idDatatype="16" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="CURRENT_TIMESTAMP" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<RELATIONS_START>
-					<RELATION_START ID="2958" />
-				</RELATIONS_START>
-				<INDICES>
-					<INDEX ID="2937" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2933"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2811" Tablename="piwik_site_url" PrevTableName=""
-				XPos="622" YPos="433" TableType="0" TablePrefix="0" nmTable="0"
-				Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="16">
-				<COLUMNS>
-					<COLUMN ID="2938" ColName="idsite" PrevColName=""
-						Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="1" />
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2939" ColName="url" PrevColName=""
-						Pos="2" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<RELATIONS_END>
-					<RELATION_END ID="2958" />
-				</RELATIONS_END>
-				<INDICES>
-					<INDEX ID="2940" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2938"
-								LengthParam="0" />
-							<INDEXCOLUMN idColumn="2939"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-			<TABLE ID="2812" Tablename="piwik_user" PrevTableName=""
-				XPos="572" YPos="67" TableType="0" TablePrefix="0" nmTable="0"
-				Temporary="0" UseStandardInserts="0" StandardInserts=""
-				TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0"
-				IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="17">
-				<COLUMNS>
-					<COLUMN ID="2941" ColName="login" PrevColName=""
-						Pos="1" idDatatype="20" DatatypeParams="(20)" Width="0" Prec="0"
-						PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2942" ColName="password" PrevColName=""
-						Pos="2" idDatatype="19" DatatypeParams="(32)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2943" ColName="alias" PrevColName=""
-						Pos="3" idDatatype="20" DatatypeParams="(45)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2944" ColName="email" PrevColName=""
-						Pos="4" idDatatype="20" DatatypeParams="(100)" Width="0" Prec="0"
-						PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2945" ColName="token_auth"
-						PrevColName="" Pos="5" idDatatype="19" DatatypeParams="(32)"
-						Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0"
-						IsForeignKey="0" DefaultValue="" Comments="">
-						<OPTIONSELECTED>
-							<OPTIONSELECT Value="0" />
-						</OPTIONSELECTED>
-					</COLUMN>
-					<COLUMN ID="2946" ColName="date_registered"
-						PrevColName="" Pos="6" idDatatype="16" DatatypeParams="" Width="0"
-						Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0"
-						DefaultValue="CURRENT_TIMESTAMP" Comments="">
-						<OPTIONSELECTED></OPTIONSELECTED>
-					</COLUMN>
-				</COLUMNS>
-				<RELATIONS_START>
-					<RELATION_START ID="2959" />
-				</RELATIONS_START>
-				<INDICES>
-					<INDEX ID="2947" IndexName="PRIMARY" IndexKind="0"
-						FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2941"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-					<INDEX ID="2948" IndexName="uniq_keytoken"
-						IndexKind="1" FKRefDef_Obj_id="-1">
-						<INDEXCOLUMNS>
-							<INDEXCOLUMN idColumn="2945"
-								LengthParam="0" />
-						</INDEXCOLUMNS>
-					</INDEX>
-				</INDICES>
-			</TABLE>
-		</TABLES>
-		<RELATIONS>
-			<RELATION ID="2958" RelationName="Rel_01" Kind="2"
-				SrcTable="2810" DestTable="2811" FKFields="idsite=idsite\n"
-				FKFieldsComments="\n" relDirection="2" MidOffset="0"
-				OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0"
-				CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0"
-				EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1"
-				Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n"
-				Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0"
-				IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1"
-				OrderPos="22" />
-			<RELATION ID="2959" RelationName="Rel_02" Kind="2"
-				SrcTable="2812" DestTable="2797" FKFields="login=login\n"
-				FKFieldsComments="\n" relDirection="3" MidOffset="0"
-				OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0"
-				CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0"
-				EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1"
-				Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n"
-				Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0"
-				IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1"
-				OrderPos="23" />
-			<RELATION ID="2962" RelationName="Rel_03" Kind="2"
-				SrcTable="2805" DestTable="2803" FKFields="idvisit=idvisit\n"
-				FKFieldsComments="\n" relDirection="4" MidOffset="0"
-				OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0"
-				CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0"
-				EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1"
-				Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n"
-				Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0"
-				IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1"
-				OrderPos="24" />
-			<RELATION ID="2966" RelationName="Rel_06" Kind="2"
-				SrcTable="2802" DestTable="2803" FKFields="idaction=idaction\n"
-				FKFieldsComments="\n" relDirection="3" MidOffset="0"
-				OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0"
-				CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0"
-				EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1"
-				Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n"
-				Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0"
-				IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1"
-				OrderPos="27" />
-			<RELATION ID="2967" RelationName="Rel_07" Kind="2"
-				SrcTable="2802" DestTable="2803" FKFields="idaction=idaction_ref\n"
-				FKFieldsComments="\n" relDirection="3" MidOffset="0"
-				OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0"
-				CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0"
-				EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1"
-				Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n"
-				Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0"
-				IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1"
-				OrderPos="26" />
-		</RELATIONS>
-		<NOTES></NOTES>
-		<IMAGES></IMAGES>
-	</METADATA>
-	<PLUGINDATA>
-		<PLUGINDATARECORDS></PLUGINDATARECORDS>
-	</PLUGINDATA>
-	<QUERYDATA>
-		<QUERYRECORDS></QUERYRECORDS>
-	</QUERYDATA>
-	<LINKEDMODELS></LINKEDMODELS>
-</DBMODEL>
diff --git a/misc/others/diagram_general_request.jpg b/misc/others/diagram_general_request.jpg
deleted file mode 100644
index 7d3174a05c..0000000000
--- a/misc/others/diagram_general_request.jpg
+++ /dev/null
diff --git a/misc/others/diagram_general_request.vsd b/misc/others/diagram_general_request.vsd
deleted file mode 100644
index d1581e3855..0000000000
--- a/misc/others/diagram_general_request.vsd
+++ /dev/null
diff --git a/misc/others/generateDoc.bat b/misc/others/generateDoc.bat
deleted file mode 100644
index b99167cb81..0000000000
--- a/misc/others/generateDoc.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-cd ..

-"C:\Program Files\EasyPHP 2.0b1\php5\php.exe" libs\PhpDocumentor-1.3.2\phpdoc -c misc\phpdoc-config.ini

-pause
\ No newline at end of file
diff --git a/misc/others/generateDoc.sh b/misc/others/generateDoc.sh
deleted file mode 100644
index a6137790d9..0000000000
--- a/misc/others/generateDoc.sh
+++ /dev/null
@@ -1 +0,0 @@
-libs/PhpDocumentor-1.3.2/phpdoc -c misc/phpdoc-config.ini
diff --git a/misc/others/phpdoc-config.ini b/misc/others/phpdoc-config.ini
deleted file mode 100644
index 037ede38a9..0000000000
--- a/misc/others/phpdoc-config.ini
+++ /dev/null
@@ -1,83 +0,0 @@
-[Parse Data]
-;; title of all the documentation
-;; legal values: any string
-title = Piwik Documentation
-
-;; parse files that start with a . like .bash_profile
-;; legal values: true, false
-hidden = false
-
-;; show elements marked @access private in documentation by setting this to on
-;; legal values: on, off
-parseprivate = on
-
-;; parse with javadoc-like description (first sentence is always the short description)
-;; legal values: on, off
-javadocdesc = off
-
-;; add any custom @tags separated by commas here
-;; legal values: any legal tagname separated by commas.
-;customtags = mytag1,mytag2
-
-;; This is only used by the XML:DocBook/peardoc2 converter
-defaultcategoryname = Documentation
-
-;; what is the main package?
-;; legal values: alphanumeric string plus - and _
-defaultpackagename = Piwik
-
-;; output any parsing information?  set to on for cron jobs
-;; legal values: on
-;quiet = on
-
-;; parse a PEAR-style repository.  Do not turn this on if your project does
-;; not have a parent directory named "pear"
-;; legal values: on/off
-;pear = on
-
-;; where should the documentation be written?
-;; legal values: a legal path
-;target = /home/cellog/output
-target = documentation
-
-;; Which files should be parsed out as special documentation files, such as README,
-;; INSTALL and CHANGELOG?  This overrides the default files found in
-;; phpDocumentor.ini (this file is not a user .ini file, but the global file)
-readmeinstallchangelog = README, INSTALL, FAQ, LICENSE
-
-;; limit output to the specified packages, even if others are parsed
-;; legal values: package names separated by commas
-;packageoutput = package1,package2
-
-;; comma-separated list of files to parse
-;; legal values: paths separated by commas
-;filename = /path/to/file1,/path/to/file2,fileincurrentdirectory
-
-;; comma-separated list of directories to parse
-;; legal values: directory paths separated by commas
-directory = core,plugins,libs/PiwikTracker
-
-;; template base directory (the equivalent directory of <installdir>/phpDocumentor)
-;templatebase = /path/to/my/templates
-
-;; directory to find any example files in through @example and {@example} tags
-;examplesdir = /path/to/my/templates
-
-;; comma-separated list of files, directories or wildcards ? and * (any wildcard) to ignore
-;; legal values: any wildcard strings separated by commas
-;ignore = /path/to/ignore*,*list.php,myfile.php,subdirectory/
-ignore = pear-*,Documentation/,tests/,*.test.php,Lexer.inc,*.tpl,*.js,*.css,*.txt,*.png,*.gif,*.jpg,*.ico,*.swf,LICENSE,README,Updates/,PhpSecInfo/,.git/,config/
-
-;; comma-separated list of Converters to use in outputformat:Convertername:templatedirectory format
-;; legal values: HTML:frames:default,HTML:frames:l0l33t,HTML:frames:phpdoc.de,HTML:frames:phphtmllib,
-;;               HTML:frames:earthli,
-;;               HTML:frames:DOM/default,HTML:frames:DOM/l0l33t,HTML:frames:DOM/phpdoc.de,
-;;               HTML:frames:DOM/phphtmllib,HTML:frames:DOM/earthli
-;;               HTML:Smarty:default,HTML:Smarty:PHP,HTML:Smarty:HandS
-;;               PDF:default:default,CHM:default:default,XML:DocBook/peardoc2:default
-output=HTML:frames:earthli
-;output=HTML:Smarty:HandS
-
-;; turn this option on if you want highlighted source code for every file
-;; legal values: on/off
-sourcecode = off