make a local copy of icon_searchbox.png for better compatibility across django versions
update for haystack 2.0.0-beta (was broken for 1.1 and 1.2 anyway)
fix "view on site" link

copy object-tools block from django admin templates
json import: parent and page slug must match exactly
make PageManager inherit from TreeManager (for rebuild() etc)
factor out page import/export into utils functions
remove some forgotten debugging code
pages_export/import_json commands
changes to support dynamic SITE_ID
partial fix for importing pages for different sites
remove earlier broken attempt at making PageAlias work with hidden sites
fix admin import/export after refactor
really fix admin import
fix revision drop-down (django 1.4 change?)
page import: fix missing symbol
Merge remote-tracking branch 'batiste/master'

Conflicts:
	pages/utils.py
Merge with wardi branch