added new code to the timeline
Merge branch 'master' of https://github.com/Walkingmage/OHLALA

Conflicts:
	book_room.php
	functions.php
	index.php
	js/show_room_booking.js
	manage_users.php
	pageheader.php
	timeline/timeline.php