get appointments
get appointments
merge from master
Successfully serialized objectproperties to json
Much work needed still!
Added getId to the interface
Added getStartTimeString + getEndTimeString methods
Appointments can now be serialized
Added methods for geting and setting by long
Geters and seters for startTime and endTime fields that works with Unix-time
Work on creating Appointment objects from json
Creating Appointment from json. Fields title, description, startTime, endTime all good. Work needed on meetingRoom and Participants
Deleted some bin and other useless files
Added .classpath again
This file keeps track of build paths
get all
Merge pull request #45 from chunfantasy/json-serializing-rebased

Json serializing rebased
Fixed Calendar constructor.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:chunfantasy/calendar

Conflicts:
	src/no/ntnu/pu/model/Calendar.java
Small fixes
Merge remote-tracking branch 'origin/master'
Small fixes
Merge remote-tracking branch 'origin/storage' into PersonControl,GroupControl

Conflicts:
	src/no/ntnu/pu/model/Appointment.java