update rails
facebook image
fix auth query
Merge branch 'master' into develop

Conflicts:
	Gemfile.lock
edit test
help modals on the event form