count user likes for groups
Merge branch 'version_2_7' into gamification
started forum inclusion
added a forum for each group
completed forum layout
Merge branch 'master' into forum_2

Conflicts:
	db/schema.rb
forum settings integration in group administration panel,
activated email notifications,
fixed bugs and added some cool ajax features

Merge branch 'version_2_8' into forum_2

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	db/schema.rb
added some cool ajax to forum
Merge branch 'master' into forum_2

Conflicts:
	app/views/layouts/_footer.html.erb
	app/views/layouts/groups.html.erb
	config/initializers/version.rb
Merge branch 'version_2_8' into forum_2

Conflicts:
	config/locales/it-IT.yml
	db/schema.rb
emoticons airesis plugin,
removed emojifi,
taggable concern
don't log that shit anymore
search filters and new layout
some css
choose_date_on_creation
Merge branch 'version_2_8' into new_filters

Conflicts:
	app/models/proposal.rb
forum mailing list configuration
alerts fix
public forums and categories
remove old quorums