Merge branch 'hotfix/onemenu_visual_fixes'
Fix broken newsletter file upload; required updating django-filebrowser to a django 1.4 compatible one, and cascade dependencies update of django-tinymce and django_uploadify
Merge branch 'hotfix/fix_broken_newsletter_upload' into develop
Merge remote-tracking branch 'upstream/develop' into develop