Point out consistent usage of wiki_id throughout data loading in wiki_menu_items_controller
Ensure consistent referencing of wiki in wiki menu items controller spec setup
Merge pull request #521 from opf/bugfix/1935_failing_specs
quick fix for failing cukes with impermanent memberships
Merge remote-tracking branch 'origin/feature/rails3' into bug/attachment_delete_closes_work_package_edit

Conflicts:
	doc/CHANGELOG.md