script to update the testing branch

This script will merge all known branches into the current
testing branch. After each merge it will be checked if there
is no merge conflict or if it doen't compile.
Merge branch 'difftool' into testing
networking

Initial try of making tiled a collaborative map editor via network.
Merge branch 'animation' into testing
Merge branch 'networking' into testing

Conflicts:
	src/tiled/mainwindow.cpp
	src/tiled/mapdocument.h