update to 6.0.1 + js for template
Merge branch 'master' of https://github.com/halilim/my-phpstorm5-settings