delemp update, doublebooking update
Merge branch 'master' of https://github.com/ddalgaard/P4-HP

Conflicts:
	functions.php