lock Dragonfly at higher version for security upgrade; upgrade gems
Merge branch 'master' into cedar

Conflicts:
	Gemfile
	Gemfile.lock