base ivy conf
add .settings to gitignore
fix
merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	idp/ivy.xml
	ivy-conf.xml