Merge branch 'hotfix/email-teamplate-reduce'
Merge pull request #130 from SimonSarazin/master

Reduced email template alert
Merge pull request #132 from freddylimpens/develop

Develop
merged release/fcr2013
Merge pull request #133 from freddylimpens/master

merging latest fix for group notifications
Updated template
Merge branch 'hotfix/email-template'
Merge branch 'hotfix/email-template' into develop
Updated email template,
deleted workgroup mailing list information
Corrected sidebar link to projects.
Merge branch 'hotfix/last-email-template-group'
Merge branch 'hotfix/last-email-template-group' into develop
added ? param for default search query set+updated requirements to use fork of haysatck that adds support for random order_by in solr backend
Merge pull request #135 from SimonSarazin/develop

Develop
Merge pull request #134 from SimonSarazin/master

Updated email template on askbot 2
fixed syntax and updated trad files
Merge branch 'master' of https://github.com/ImaginationForPeople/imaginationforpeople into develop
updated trad in fr
Merge branch 'master' of https://github.com/ImaginationForPeople/imaginationforpeople into develop
fixed error because of incompatibility of trans tag between jinja2 and django templates
Merge branch 'hotfix/trad-on-askbot-mail'