#12
Merge remote-tracking branch 'origin/master' into MonthView

Conflicts:
	src/no/ntnu/pu/gui/view/MonthView.java
	src/no/ntnu/pu/gui/view/WeekView.java
storage
Added PropertyChangeListener to SidePanels. #29
Added .settings folder to gitignore
Merge remote-tracking branch 'origin/master' into MonthView

Conflicts:
	src/no/ntnu/pu/gui/view/MonthView.java
	src/no/ntnu/pu/gui/view/WeekView.java
Added casting i PropertyChangeListener method. #29
Merge remote-tracking branch 'origin/master' into MonthView

Conflicts:
	src/no/ntnu/pu/gui/view/MonthView.java
	src/no/ntnu/pu/gui/view/WeekView.java
Merge remote-tracking branch 'origin/master' into MonthView

Conflicts:
	src/no/ntnu/pu/gui/view/MonthView.java
	src/no/ntnu/pu/gui/view/WeekView.java
worked on get methods
merge from master
get group by person
get group by person
get group by person
Merge branch 'master' of github.com:chunfantasy/calender
Merge remote-tracking branch 'origin/master' into MonthView

Conflicts:
	src/no/ntnu/pu/gui/view/AppointmentView.java
Added Email classes. #30
Merge remote-tracking branch 'origin/master' into MonthView

Conflicts:
	src/no/ntnu/pu/gui/view/AppointmentView.java
Merge remote-tracking branch 'origin/master' into MonthView

Conflicts:
	src/no/ntnu/pu/gui/view/AppointmentView.java
Finished Email implementation. #30