Merge branch 'hotfix/haystack'
Fix add lang menu on project page unreachable depending on translation
Merge branch 'hotfix/lang_menu_unreachable'
Merge branch 'develop'

Conflicts:
	fabfile.py
Update fabfile for compass upgrade
Fix django-compress problems with DEBUG=false
Merge branch 'hotfix/fabfile' into develop