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

Conflicts:
	Gemfile