removing .idea folder from project
git ignore now contains entries for .idea
gradle updated
.gitignore updated
deleted build.sbt
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	.idea/IdeaProject.iml
	.idea/codeStyleSettings.xml
	.idea/copyright/profiles_settings.xml
	.idea/misc.xml
	.idea_modules/xaHChat-build.iml
	.idea_modules/xaHChat.iml
	build.sbt
	project/plugins.sbt