fix
Merge branch 'version_3_2' into version_3_3
card appears,
css refactoring,
some stuff for petitions
Merge branch 'version_3_3' of https://github.com/mion00/Airesis into version_3_3

Conflicts:
	app/views/layouts/_new_footer.html.erb
bugfix
test for a new home page
solr config and banners
fixes for notifications on subdomains
fixed I18n
added pt-pt
bump version
re-fix
bugfixing
Merge branch 'version_3_2' of https://github.com/mion00/Airesis into version_3_2
configs
Merge branch 'version_3_2' into version_3_3

Conflicts:
	app/views/proposal_comments/report.js.erb
try to compile fast
Merge remote-tracking branch 'upstream/version_3_3' into version_3_3_1

Conflicts:
	app/assets/stylesheets/foundation_and_overrides.scss
Merge remote-tracking branch 'upstream/version_3_3' into version_3_3_1