update
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/ch/bfh/btx8081/w2013/red/GUI/Comment.java