dropped in 2.7 files
restored files for upgrade
removed installer folder
removed offline index file
2.7.0 compatability
updated categeory field fieldtype
applied Router.php patch file
removed 'ping_return_url' from reelocate
Merge branch 'develop' into upgrade

Conflicts:
	offline.html
Merge branch 'develop' into upgrade
updates from other branch
added upgrade script
updated upgrade script
updated upgrade script again
updated upgrade script again
updated upgrade script again
Merge branch 'upgrade' into staging

Conflicts:
	upgrade.sh
Merge branch 'upgrade' into develop

Conflicts:
	upgrade.sh
removed upgrade script and offline template
deleted upgrade files: upgrade.sh and offline.html
Merge branch 'develop' into staging

Conflicts:
	upgrade.sh
removed upgradef iles: upgrade.sh and offline template
Merge branch 'staging'