Updated javadoc for ical4j 2
Generify tests
Merge remote-tracking branch 'origin/master'