added codemirror support for simulation admin
judging: change the subject of the emails sent out, and do not wrap the comments with the templates
Don't promote if promotion has been already done
Constraint on association proposal with phase guarded in promoteProposal method
Smap fix
run autopromote task only ever hour
Merge branch 'master' of https://github.com/CCI-MIT/XCoLab
change interval back to every minute, change already associated check to check for the next phase
Autopromotion task can be run only by one thread at a time
Merge branch 'master' of https://github.com/CCI-MIT/XCoLab
judging promotion: do not post empty comments
repair proposals portlet preferences / remove template texts
Merge branch 'master' into points

Conflicts:
	services/plansProposalsFacade/plansProposalsFacade-portlet/src/main/java/com/ext/portlet/service/impl/ProposalLocalServiceImpl.java