Add rails erd gem
Change translation model to place translation
Change database to mysql
Merge branch 'master' of github.com:Khalasar/wdwBackend

Conflicts:
	Gemfile
	Gemfile.lock
	app/helpers/places_helper.rb
Merge branch 'mac-database'

Conflicts:
	config/database.yml
Merge branch 'master' of github.com:Khalasar/wdwBackend
Add translations