Bug CVS is fixed
Bug fix CVS is fixed
Own config
Merge branch 'stable' of https://github.com/opf/openproject into stable

Conflicts:
	Gemfile.lock