set class
merge set
arrayList
arrayList
Set again
fixed merge issues
some javadoc
added javadoc
merged master into branch