Logout funk og loginfield rendered
jioadop
Merge branch 'master' of git://github.com/almyy/HealthyCatering.git

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml