more javadocs
Merge branch 'master' of github.com:espehel/UbiLearn

Conflicts:
	UbiLearnProject/.DS_Store