Merge branch 'release/fcr2013' into develop
Merge branch 'hotfix/noreversematch' into develop
Merge branch 'hotfix/mail-template' into develop
Merge pull request #125 from SimonSarazin/develop

Hotfix test new template
Merge branch 'hotfix/mail-template' into develop
Merge branch 'develop' of https://github.com/ImaginationForPeople/imaginationforpeople into develop
Update localization.rst
Merge branch 'hotfix/workgoup§translation' into develop
Merge branch 'develop' of github.com:SimonSarazin/imaginationforpeople into develop
Merge pull request #127 from SimonSarazin/develop

Update workgroup translation
Merge branch 'hotfix/email-teamplate-fix' into develop
Merge pull request #129 from SimonSarazin/develop

Hotfix updated mail template
fabfile:  Remove non-postgis download and restore functions, as they do not work anymore.  You NEED postgis to restore the prod database
Merge branch 'hotfix/add_location_bug' into develop
Merge branch 'hotfix/email-teamplate-reduce' into develop
Merge pull request #131 from SimonSarazin/develop

Reduced email template on askbot
merged release/fcr2013
Merge pull request #132 from freddylimpens/develop

Develop
Merge branch 'hotfix/email-template' into develop
Merge branch 'hotfix/last-email-template-group' into develop