bugfixes
a lot of bugfixes
Merge branch 'master' of github.com:coorasse/Airesis
fixes
Merge branch 'master' of git://github.com/leoniglio/Airesis

Conflicts:
	app/views/proposal_comments/_proposal_comment.html.erb
Merge remote-tracking branch 'remotes/upstream/master'
quorum più intuitivi