Added all Chalmers-pubs
Added all Chalmers-pubs
Fixing merge
Javadoc
javadoc
merge