added romania stuff
Merge branch 'master' into version_3_0

Conflicts:
	config/initializers/version.rb
	db/schema.rb