Conflicts:
	WebContent/structure.txt
	WebContent/watchdad/activiteiten.php
	WebContent/watchdad/framework/bootstrap/.netbeans.xml
	WebContent/watchdad/inbox.php
	WebContent/watchdad/index.php
	WebContent/watchdad/leefpatroon.php
	WebContent/watchdad/livefeed.php
	WebContent/watchdad/login.php
	WebContent/watchdad/modules/backend/OLD_check_messages.php
	WebContent/watchdad/modules/backend/load_notifications.php
	WebContent/watchdad/modules/functions.php
	WebContent/watchdad/modules/header.php
	WebContent/watchdad/modules/navigation.php
	WebContent/watchdad/modules/sec_components/authentication.php
	WebContent/watchdad/modules/sec_components/load_messages.php
	WebContent/watchdad/modules/sec_components/load_notifications.php
	WebContent/watchdad/modules/sec_components/mail.php
	WebContent/watchdad/status.php