fixed bug in sending messages
fix
other fixing for i18n in invite email and admin messages
another quick fix
fix for feedback
add or option in groups searh
Merge branch 'master' into version_3_0

Conflicts:
	app/mailers/resque_mailer.rb