Merge branch 'redmine'

Conflicts:
	app/models/version.rb
	config/locales/fa.yml