added Atmosphere for websockets
Merge remote-tracking branch 'origin/master'

Conflicts:
	Java/pom.xml