added some javadocs, cleaned a bit

not finished though, I think
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team7