Merge remote-tracking branch 'upstream/develop' into develop
overloaded views with discussion count and added project needs count on project menubar
fixed wrong number displayed for needs or discussion depending on active tab. Had to overload main, discussion, and support views to get right number in all cases
Add API KEY creation for users (models & migration).
added 2 fields for setting iframe src, and added test in home and description templates for displaying iframe if chosen
added new page for displaying linked projects in card format
Merge branch 'hotfix/fix-search_filter.js'
Fix #1467:
Language switcher is giving wrong slug for cms pages
Flat images left in p and li elements on onemenu page template
Restore the project for tag django cms plugin that crashed since obsolete/project_complete_card.html was deleted
Fix #1467:
Language switcher is giving wrong slug for cms pages
Flat images left in p and li elements on onemenu page template
Restore the project for tag django cms plugin that crashed since obsolete/project_complete_card.html was deleted
Also remove obsolete css reference
Also remove obsolete css reference
Merge branch 'hotfix/2013-07-11-menu2'
Merge branch 'hotfix/2013-07-11-menu2' into develop
commented out shout box
added tab with list archives (iframed) + changed integration for card-style project list
list archive appears only for group with mailing list