Client and server integrated into one jar
Improved file organization
Added .gitignore
Modified output jar to be ConvoSyncBundle.jar
Updated vendor properties
Merge branch 'dev'

Conflicts:
	.gitignore
	nbproject/project.properties