finished my work
finished work
Merge remote-tracking branch 'origin/task11-3.3' into Sprint3/task11-0.5

Conflicts:
	Project Pink/src/main/java/ch/bfh/bti7081/s2013/pink/SessionWindow.java
Improving session view (work in progress)
Almost everything works now (well, some things do)