Removed AddPanels as superclass since it was found redundant. Finished basic design on AddParticipant and AppointmentView, started implementing basic design on AddRoom
--
--
Merge remote-tracking branch 'origin/master' into NotificationModel
--
Merge remote-tracking branch 'origin/NotificationModel' into NotificationModel

Conflicts:
	src/no/ntnu/pu/gui/view/AppointmentView.java
	src/no/ntnu/pu/model/Appointment.java
--
Merge remote-tracking branch 'origin/NotificationModel' into PersonControl,GroupControl

Conflicts:
	src/no/ntnu/pu/gui/panel/AddRoom.java
	src/no/ntnu/pu/model/Appointment.java
	src/no/ntnu/pu/model/Calendar.java
Merge remote-tracking branch 'origin/AppointmentListener' into PersonControl,GroupControl

Conflicts:
	src/no/ntnu/pu/model/Appointment.java
Merge remote-tracking branch 'origin/NotificationModel' into PersonControl,GroupControl
Added search.png
Merge remote-tracking branch 'origin/NotificationModel' into PersonControl,GroupControl
Merge remote-tracking branch 'origin/AppointmentListener' into PersonControl,GroupControl

Conflicts:
	src/no/ntnu/pu/model/Appointment.java
Merge remote-tracking branch 'origin/AppointmentListener' into PersonControl,GroupControl

Conflicts:
	src/no/ntnu/pu/model/Appointment.java
Merge remote-tracking branch 'origin/AppointmentListener' into PersonControl,GroupControl

Conflicts:
	src/no/ntnu/pu/model/Appointment.java
Merge branch 'master' into PersonControl,GroupControl

Conflicts:
	src/no/ntnu/pu/gui/view/MainView.java
	src/no/ntnu/pu/model/Person.java
Merge branch 'master' into PersonControl,GroupControl

Conflicts:
	src/no/ntnu/pu/gui/view/MainView.java
	src/no/ntnu/pu/model/Person.java
Merge branch 'master' into PersonControl,GroupControl

Conflicts:
	src/no/ntnu/pu/gui/view/MainView.java
	src/no/ntnu/pu/model/Person.java
Merge branch 'master' into PersonControl,GroupControl

Conflicts:
	src/no/ntnu/pu/gui/view/MainView.java
	src/no/ntnu/pu/model/Person.java
Merge branch 'master' into PersonControl,GroupControl

Conflicts:
	src/no/ntnu/pu/gui/view/MainView.java
	src/no/ntnu/pu/model/Person.java