proposals typo
Merge branch 'version_2_8' into version_3_0
new proposal alerts count for better performance
missing file
missing file
Merge branch 'version_2_8' into version_3_0
URGENT: tinymce fix for firefox
completly new search method for proposals
some urgent fixes
add zh translation & fix bootstrap errors
fixed notifications for proposals in the group area,
fixed cancan messages i18n

Merge branch 'master' into version_3_0

Conflicts:
	app/views/proposals/edit.html.erb
	config/initializers/version.rb
fixed bug in sending messages
fix
other fixing for i18n in invite email and admin messages
another quick fix
fix for feedback
fixed groups search...i hope
add or option in groups searh
Merge branch 'master' into version_3_0

Conflicts:
	app/mailers/resque_mailer.rb
fucking solr configuration that messing up everything
fix lost proposals