updates for: phpstorm, rubymine, nginx, php
merge