Updates for Omeka 2.0
updates for 2.0
Merge branch 'master' of github.com:omeka/plugin-Contribution

Conflicts:
	ContributionPlugin.php
	controllers/SettingsController.php
	controllers/TypesController.php
	helpers/ThemeHelpers.php
	models/ContributionType.php
	models/Table/ContributionType.php
	plugin.php
	views/admin/contributor-metadata/edit.php
	views/admin/contributors/browse.php
	views/admin/contributors/show.php
	views/admin/index/index.php
	views/admin/settings/edit.php
	views/admin/types/add.php
	views/admin/types/browse.php
	views/admin/types/edit.php
	views/public/contribution/contribute.php
	views/public/contribution/type-form.php