storage
storage
merge from master
#15

Filled in MonthView, need to enable single-day editor
#15

Filled in MonthView
#15

Filled in MonthView
finish insert
Merge branch 'master' of github.com:chunfantasy/calender into storage
Merge branch 'storage' of github.com:chunfantasy/calender
storage
add id to models
Merge branch 'master' of github.com:chunfantasy/calender into storage
storage
#15
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
#15
#15
#15
Merge pull request #26 from chunfantasy/SidePanels

Side panels