Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/wissi1/ch.bfh.btx8081.w2013.red.git
javadoc
Merge remote-tracking branch 'origin/master'
javadoc