fix
fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
fix
fix
fix
fix
fix
fix
fix
fix
fix
fix
fix
fix