plugin name change
fixed merge problems
trial changes
added back upgrade.inc file