initial setup
initial setup
Merge branch 'version_2_7' of https://github.com/coorasse/Airesis into version_2_7

Conflicts:
	config/locales/eu.yml
	config/locales/net.yml
	config/locales/org.yml
	config/locales/us.yml
Improving il18n
removed untracked files
redo remove files
Merge branch 'version_2_7' of https://github.com/coorasse/Airesis.git into version_2_7
re-add .gitignore
Greatly improved it.yml

Moved different lines in it.yml to be better organized
Improved en.yml

Almost ready to start using Crowdin as external translation tool

en.yml 90 % translated (I'll finish it ASAP)
it.yml changed in order to be better organized
Merge branch 'version_2_7' of https://github.com/coorasse/Airesis.git into version_2_7

Conflicts:
	app/controllers/proposal_comments_controller.rb
	app/views/groups/index.html.erb
	config/locales/en.yml
	config/locales/it.yml
count user likes for groups
Fixed search button
Merge branch 'version_2_7' into gamification
started forum inclusion
improved search groups
added a forum for each group
improved il18n
fixed typos in en.yml
Merge branch 'version_2_7' of https://github.com/coorasse/Airesis.git into version_2_7

Conflicts:
	app/controllers/proposals_controller.rb
	app/helpers/notification_helper.rb
	app/views/groups/index.html.erb
	config/database.yml
	config/locales/en.yml
	config/locales/it.yml
small fixes to il18n