diff --git a/.gitignore b/.gitignore
index 8eed2d506..6c9b3eab3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,3 @@ $RECYCLE.BIN/
# breakpad symlink / directory
/google-breakpad
/google-breakpad/
-
-# convert_faction_xml2html
-/html/
diff --git a/data/glest_game b/data/glest_game
index 1500d779c..d5ac96e7a 160000
--- a/data/glest_game
+++ b/data/glest_game
@@ -1 +1 @@
-Subproject commit 1500d779ccaa5e1d525863b1fd7911f0303a38e8
+Subproject commit d5ac96e7a7e29e3c2ac7142eace8291e4c5ddb03
diff --git a/source/tools/convert_faction_xml2html/.gitignore b/source/tools/convert_faction_xml2html/.gitignore
new file mode 100644
index 000000000..ac7af2e80
--- /dev/null
+++ b/source/tools/convert_faction_xml2html/.gitignore
@@ -0,0 +1 @@
+/html/
diff --git a/source/tools/convert_faction_xml2html/compare.html b/source/tools/convert_faction_xml2html/compare.html
deleted file mode 100644
index 36dabb59a..000000000
--- a/source/tools/convert_faction_xml2html/compare.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-Compare Glest Units
-
-
-
-
-
-
-
diff --git a/source/tools/convert_faction_xml2html/compare_help.html b/source/tools/convert_faction_xml2html/compare_help.html
deleted file mode 100644
index b76a95c93..000000000
--- a/source/tools/convert_faction_xml2html/compare_help.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-Compare Glest Units
-
-
-
-
-
-
-
-Choose units in the left and right frames to compare.
-
-
-
diff --git a/source/tools/convert_faction_xml2html/favicon.ico b/source/tools/convert_faction_xml2html/favicon.ico
deleted file mode 100644
index af3a758f2..000000000
Binary files a/source/tools/convert_faction_xml2html/favicon.ico and /dev/null differ
diff --git a/source/tools/convert_faction_xml2html/make_html_for_git_docs.sh b/source/tools/convert_faction_xml2html/make_html_for_git_docs.sh
new file mode 100755
index 000000000..3d1ffd24d
--- /dev/null
+++ b/source/tools/convert_faction_xml2html/make_html_for_git_docs.sh
@@ -0,0 +1,95 @@
+#!/bin/sh
+#
+# Use this script to make autodocumentation for docs in data's repository
+# ----------------------------------------------------------------------------
+# 2015 Written by filux
+# Copyright (c) 2015 under GNU GPL v3.0+
+LANG=C
+
+if [ "$1" = "" ]; then
+ techtree="megapack"
+else
+ techtree="$1"
+fi
+if [ "$2" = "" ]; then
+ rel_path_docs_icons="../../techs"
+else
+ rel_path_docs_icons="$2"
+fi
+if [ "$3" = "" ]; then
+ rel_path_tech_test="../../../../data/glest_game/techs"
+else
+ rel_path_tech_test="$3"
+fi
+SCRIPTDIR="$(dirname "$(readlink -f "$0")")"
+cd "$SCRIPTDIR"
+rm -rf html
+sed "s|^generate_g3d_images = .*|generate_g3d_images = 0|" "$techtree.ini" > "$techtree-temp.ini"
+./convert_faction_xml2html.pl "$techtree-temp.ini"
+
+cd html
+icons_list1="$(grep -o "images/[^/ ]*/[^/ ]*/[^. ]*.bmp" *.html)"
+icons_list2="$(grep -o "images/[^/ ]*/[^/ ]*/[^. ]*.jpg" *.html)"
+icons_list3="$(grep -o "images/[^/ ]*/[^/ ]*/[^. ]*.png" *.html)"
+icons_list="$(echo -e "$icons_list1 $icons_list2 $icons_list3" | xargs)"
+echo ">>> replacing icon for (unit='|', upgrade='\', resource='/') ..."
+for icon_file in $icons_list; do
+ filename="$(echo "$icon_file" | awk -F ':' '{print $1}')"
+ icon="$(echo "$icon_file" | awk -F ':' '{print $2}')"
+
+ faction="$(echo "$icon" | awk -F '/' '{print $2}')"
+ uu_name="$(echo "$icon" | awk -F '/' '{print $3}')"
+ bmp_file="$(echo "$icon" | awk -F '/' '{print $4}')"
+ find_file="$(find $rel_path_tech_test/$techtree/factions/$faction -type f -name "$bmp_file")"
+
+ echo "$find_file" | grep -q "factions/$faction/upgrades"
+ if [ "$?" -eq "0" ]; then :
+ sed -i "s|images/$faction/$uu_name/$bmp_file|$rel_path_docs_icons/$techtree/factions/$faction/upgrades/$uu_name/images/$bmp_file|" "$filename"
+ echo -n "\\"
+ else
+ echo "$find_file" | grep -q "factions/$faction/units"
+ if [ "$?" -eq "0" ]; then :
+ sed -i "s|images/$faction/$uu_name/$bmp_file|$rel_path_docs_icons/$techtree/factions/$faction/units/$uu_name/images/$bmp_file|" "$filename"
+ echo -n "|"
+ fi
+ fi
+ sleep 0.01s
+done
+icons_list1="$(grep -o "images/resources/[^. ]*.bmp" *.html)"
+icons_list2="$(grep -o "images/resources/[^. ]*.jpg" *.html)"
+icons_list3="$(grep -o "images/resources/[^. ]*.png" *.html)"
+icons_list="$(echo -e "$icons_list1 $icons_list2 $icons_list3" | xargs)"
+for icon_file in $icons_list; do
+ filename="$(echo "$icon_file" | awk -F ':' '{print $1}')"
+ icon="$(echo "$icon_file" | awk -F ':' '{print $2}')"
+
+ bmp_file="$(echo "$icon" | awk -F '/' '{print $3}')"
+ res_name="$(echo "$bmp_file" | awk -F '.' '{print $1}')"
+ sed -i "s|images/resources/$bmp_file|$rel_path_docs_icons/$techtree/resources/$res_name/images/$bmp_file|" "$filename"
+ echo -n "/"
+ sleep 0.01s
+done
+echo
+
+echo ">>> removing not required files ..."
+rm -rf css js
+find ./images/*/* -type d | xargs rm -rf
+rm -rf images/datatables images/resources
+find ./images/* -type f -name "*.canon" | xargs rm -f
+find ./images/* -type f -name "*.cmapx" | xargs rm -f
+find ./images/* -type f -name "*.text" | xargs rm -f
+
+rm -f all.html
+all_html_list="$(grep '"all.html"' *.html | awk -F ':' '{print $1}' | xargs)"
+for filename in $all_html_list; do
+ sed -i '/All Units of all Factions/d' "$filename"
+done
+
+if [ "$(which optipng)" != "" ]; then
+ echo ">>> optimizing .png files ..."
+ find ./images -type f -name '*.png' -exec optipng '{}' \;
+else
+ echo "Warning: 'optipng' not found"
+fi
+cd "$SCRIPTDIR"
+rm -f "$techtree-temp.ini"
diff --git a/source/tools/convert_faction_xml2html/media/.gitignore b/source/tools/convert_faction_xml2html/media/.gitignore
new file mode 100644
index 000000000..25357256b
--- /dev/null
+++ b/source/tools/convert_faction_xml2html/media/.gitignore
@@ -0,0 +1 @@
+/jquery*.min.js
diff --git a/source/tools/convert_faction_xml2html/media/compare.html b/source/tools/convert_faction_xml2html/media/compare.html
index 03344468c..36dabb59a 100644
--- a/source/tools/convert_faction_xml2html/media/compare.html
+++ b/source/tools/convert_faction_xml2html/media/compare.html
@@ -11,8 +11,8 @@