.gitignore
updated .gitignore, fixed .idea/ directory
ant build.xml script
log4j libraries
smack libraries
Empty project with loading configurations
changed .gitignore, merged with github and added dist and build directories
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore