Fix compilation.
Merge remote-tracking branch 'origin/139' into 139
Django 1.7 Py3K fix

(cherry picked from commit 4b123773bb267cb0803502b94894800e7ff0817e)
PY-13363 Django: not able to uncomment block comments with argument description

(cherry picked from commit 2c303f4614bf50acadc226ffb3c232c2c3f37376)
PY-11180 Template Create dialog is too small
PY-11959 Add inspection options to force pycharm inspection suggesting first current app template folder to create a new template file
PY-13501 Wrong location on html template file creation option.

(cherry picked from commit 55a7608f865ca6345525cf369fac4aae3545d8f0)
fix slicing
(cherry picked from commit a9db68a)