added appComponentVersions.xml to .gitignore
added options folder to .gitignore
Merge branch 'master' of https://github.com/sabram/IntelliJ

Conflicts:
	.gitignore