removed old login function from sf
removed unneeded includes
removed network code from JsonFactory
removed comment
removed all references to network code in calendarProgram
moved factory files to either client or server package where they belong
Merge branch 'master' of github.com:aleksanb/fellesprosjektet

Conflicts:
	src/db/Appointment.java