Platformafhankelijke file
Platform onafhankelijk files.
Merge branch 'master' of http://github.com/CalZoneVUB/CalZone
Merge pull request #14 from gaethofs/master

Theme inclusion.
update
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment
Login Creation validators for Users and Email
Done by custom annotations
Ondersteuning voor (gedeeltelijke) mailfunctionaliteit.
Activation of created account
	TODO: Sending the email with the link
Toevoegen van JavaServer/calzone/bin
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone

Conflicts:
	JavaServer/calzone/.classpath
Bolt op wilma +
Error fix email null pointer exception
Readme Deployment
stop tracking of MANIFEST.MF since it gets changed by Eclipse on each device
Merge pull request #18 from yocoppen/master

stop tracking of MANIFEST.MF since it gets changed by Eclipse on each de...
Merge branch 'JavaMail'
Merge branch 'master' of http://github.com/CalZoneVUB/CalZone
Merge pull request #19 from MPieter/master

Ondersteuning voor mailing.
Quickfix mailserver disabled in web.xml
Setback Filem .settings