added *.iws to .gitignore
Merge remote branch 'origin/0.94-gd' into fb-YAHOO-317-0.94-gd