fixed conflicts
Merge remote-tracking branch 'origin/team1-dev' into team1-dev
started to work on the yellow boxes, still a few issues to work out
Merge remote-tracking branch 'origin/team1-dev' into team1-dev
fixed some bugs, in the delete button and in some asthetics issues
log needed
Merge remote-tracking branch 'origin/team1-dev' into team1-dev

Conflicts:
	RequirementsManager/test_PermissionsLog.txt