bump
Merge branch 'master' of https://github.com/jdfdesign/gko_vie_en_rose_com

Conflicts:
Gemfile
Gemfile.lock
db/schema.rb
Merge branch 'master' of https://github.com/jdfdesign/gko_vie_en_rose_com

Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb