trimmed out test/, po/, libraries/tcpdf/, js/openlayers/, themes/original/, and maybe a couple other files to make this as lightweight as possible
merged