delete rubymine files, fix plan test
merge master to plans