Branch Tester
changed bookmark button
added into adController
bookmark implemented and working

Screening at the very beginning needs to be fixed... otherwise done
Merge remote-tracking branch 'origin/master' into intergalact

Conflicts:
	Source/src/main/java/ch/unibe/ese/team1/controller/AdController.java