added Java folder
test
Initial push
Merge branch 'master' of https://github.com/esemsch/alex2
Moved code to Java folder
gitignore
Restructured
Created Java subfolder
Moved pom.xml to Java folder
fact repository hack version
Merge branch 'master' of https://github.com/esemsch/alex2
fact repository hack version
added dropwizard
added readme.txt
added FTL template
fact repository hack version
merge in master
Basic room and class and manager to retrieve room details.
added Atmosphere for websockets
Merge remote-tracking branch 'origin/master'

Conflicts:
	Java/pom.xml