Updated .gitignore

Framework Ignores, OS Ignores, IDE Ignores, Other Ignores
Merge branch 'dev-master'