fix django console for PY-13031
remove old code with execute_manager and setup_environ
fix django prompt

(cherry picked from commit e73466601e3bbc2ec7af5a2aa1fd31f85077fb12)
return code in django_manage_shell for old django versions

(cherry picked from commit c68f2317b36516c93e6095f3e0c836c729b5ebdc)
PyCharm 3.4 artwork.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of git.labs.intellij.net:idea/community
Merge branch 'master' of git.labs.intellij.net:idea/community
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of git.labs.intellij.net:idea/community
Merge branch 'master' of git.labs.intellij.net:idea/community
IDEA-125137 Click on failed unit test console output to navigate to test fails when using Groovy test name with '()' in test method name
IDEA-125397 Cyclic Expand Word no longer completes numbers
SQL: per-statement file structure grouping
PY-11592 Django 1.6: TEMPLATE_DIRS variable in settings.py is not created properly on project creation
Merge remote-tracking branch 'origin/master'