Merge remote-tracking branch 'upstream/develop' into feature/1374-linking-question-to-group
Merge branch 'hotfix/haystack'
added M2M relation with a question (askbot.models.Thread) into workgroup model + created corresponding migration
created an autocomplete_light_registry file within forum apps folder to make Thread fields (aka questions field) autocompletable when linking a question to a workgroup
Merge branch 'develop' of https://github.com/ImaginationForPeople/imaginationforpeople into feature/1374-linking-question-to-group
allow links in project questions and about field (#1404) and fixes ajax formatting
fixes error when pictures is rgba instead of rgb
Merge branch 'develop' of https://github.com/ImaginationForPeople/imaginationforpeople into feature/1374-linking-question-to-group
Merge remote-tracking branch 'upstream/develop' into feature/1374-linking-question-to-group
fixes sentry #3602310 (video adding)
cleaned code
Merge branch 'feature/1374-linking-question-to-group' of https://github.com/freddylimpens/imaginationforpeople into feature/1374-linking-question-to-group
Fix add lang menu on project page unreachable depending on translation
Merge branch 'hotfix/lang_menu_unreachable'
Fix add lang menu on project page unreachable depending on translation
Upgrade compass_twitter_bootstrap to version 2.2.2.2, lock the version in the gemfile and commit the matching js and image files.  Previously we had unpredictable mismatches between bootstrap javascript and scss.  I ported the whole site to use the new js files EXCEPT FOR THE FORUM.  Various other template and style cleanup
Fixes #1344
Merge branch 'develop' of github.com:ImaginationForPeople/imaginationforpeople into develop
cleaned code to match python standards of editing
Merge branch 'develop' of https://github.com/ImaginationForPeople/imaginationforpeople into feature/1374-linking-question-to-group