diff --git a/app/conference_sessions/app_config.php b/app/conference_sessions/app_config.php
new file mode 100644
index 0000000000..b721559ee0
--- /dev/null
+++ b/app/conference_sessions/app_config.php
@@ -0,0 +1,107 @@
+<?php
+	//application details
+		$apps[$x]['name'] = 'Conference Sessions';
+		$apps[$x]['uuid'] = '66e82261-3a7a-469d-84b1-370325a29fcf';
+		$apps[$x]['category'] = '';
+		$apps[$x]['subcategory'] = '';
+		$apps[$x]['version'] = '';
+		$apps[$x]['license'] = 'Mozilla Public License 1.1';
+		$apps[$x]['url'] = 'http://www.fusionpbx.com';
+		$apps[$x]['description']['en'] = '';
+
+	//menu details
+		$apps[$x]['menu'][0]['title']['en'] = 'Conference Sessions';
+		$apps[$x]['menu'][0]['uuid'] = '0daea9eb-5555-4325-be57-e3b6a30d5253';
+		$apps[$x]['menu'][0]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
+		$apps[$x]['menu'][0]['category'] = 'internal';
+		$apps[$x]['menu'][0]['path'] = '/app/conference_sessions/conference_sessions.php';
+		//$apps[$x]['menu'][0]['groups'][] = 'user';
+		//$apps[$x]['menu'][0]['groups'][] = 'admin';
+		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
+
+	//permission details
+		$y = 0;
+		$apps[$x]['permissions'][$y]['name'] = 'conference_session_view';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'user';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'conference_session_add';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'conference_session_edit';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'user';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'conference_session_delete';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+
+	//schema details
+		$y = 0; //table array index
+		$z = 0; //field array index
+		$apps[$x]['db'][$y]['table'] = 'v_conference_sessions';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+		$apps[$x]['db'][$y]['fields'][$z]['key'] = 'foreign';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'conference_session_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+		$apps[$x]['db'][$y]['fields'][$z]['key'] = 'primary';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'conference_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Conference UUID';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'meeting_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Meeting UUID';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'max_members';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Limit number of people in the conference.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'wait_mod';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Wait for the moderator to join before starting the conference.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'announce';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Introduce participants as they enter the conference.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'enter_sound';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'The sound played when someone enters the conference.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'mute';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Mute participants on entering the conference.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'created';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Date when the conference was created.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'created_by';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'The user that created the conference session.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'enabled';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Select to enable or disable the session.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'description';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Description.for the conference session.';
+		$z++;
+?>
\ No newline at end of file
diff --git a/app/conference_sessions/conference_session_delete.php b/app/conference_sessions/conference_session_delete.php
new file mode 100644
index 0000000000..f0afe6a6c4
--- /dev/null
+++ b/app/conference_sessions/conference_session_delete.php
@@ -0,0 +1,75 @@
+<?php
+require_once "root.php";
+require_once "includes/require.php";
+require_once "includes/checkauth.php";
+if (permission_exists('conference_session_delete')) {
+	//access granted
+}
+else {
+	echo "access denied";
+	exit;
+}
+
+if (count($_GET)>0) {
+	$id = check_str($_GET["id"]);
+}
+
+if (strlen($id)>0) {
+	//get the meeting_uuid
+		if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
+			$conference_session_uuid = check_str($_GET["id"]);
+			$sql = "select * from v_conference_sessions ";
+			$sql .= "where domain_uuid = '$domain_uuid' ";
+			$sql .= "and conference_session_uuid = '$conference_session_uuid' ";
+			$prep_statement = $db->prepare(check_sql($sql));
+			$prep_statement->execute();
+			$result = $prep_statement->fetchAll();
+			foreach ($result as &$row) {
+				$meeting_uuid = $row["meeting_uuid"];
+			}
+			unset ($prep_statement);
+		}
+
+	//delete the conference session
+		$sql = "delete from v_conference_sessions ";
+		$sql .= "where domain_uuid = '$domain_uuid' ";
+		$sql .= "and conference_session_uuid = '$id' ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		unset($sql);
+
+	//delete the meeting users
+		$sql = "delete from v_meeting_users ";
+		$sql .= "where domain_uuid = '$domain_uuid' ";
+		$sql .= "and meeting_uuid = '$meeting_uuid' ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		unset($sql);
+
+	//delete the meeting pins
+		$sql = "delete from v_meeting_pins ";
+		$sql .= "where domain_uuid = '$domain_uuid' ";
+		$sql .= "and meeting_uuid = '$meeting_uuid' ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		unset($sql);
+
+	//delete the meetings
+		$sql = "delete from v_meetings ";
+		$sql .= "where domain_uuid = '$domain_uuid' ";
+		$sql .= "and meeting_uuid = '$meeting_uuid' ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		unset($sql);
+}
+
+//redirect the user
+	require_once "includes/header.php";
+	echo "<meta http-equiv=\"refresh\" content=\"2;url=conference_sessions.php\">\n";
+	echo "<div align='center'>\n";
+	echo "Delete Complete\n";
+	echo "</div>\n";
+	require_once "includes/footer.php";
+	return;
+
+?>
\ No newline at end of file
diff --git a/app/conference_sessions/conference_session_edit.php b/app/conference_sessions/conference_session_edit.php
new file mode 100644
index 0000000000..a5a33508ab
--- /dev/null
+++ b/app/conference_sessions/conference_session_edit.php
@@ -0,0 +1,645 @@
+<?php
+require_once "root.php";
+require_once "includes/require.php";
+require_once "includes/checkauth.php";
+if (permission_exists('conference_session_add') || permission_exists('conference_session_edit')) {
+	//access granted
+}
+else {
+	echo "access denied";
+	exit;
+}
+
+//action add or update
+	if (isset($_REQUEST["id"])) {
+		$action = "update";
+		$conference_session_uuid = check_str($_REQUEST["id"]);
+	}
+	else {
+		$action = "add";
+	}
+
+//get http post variables and set them to php variables
+	if (count($_POST)>0) {
+		$conference_uuid = check_str($_POST["conference_uuid"]);
+		$member_pin = check_str($_POST["member_pin"]);
+		$member_type = check_str($_POST["member_type"]);
+		$user_uuid = check_str($_POST["user_uuid"]);
+		$max_members = check_str($_POST["max_members"]);
+		$wait_mod = check_str($_POST["wait_mod"]);
+		$announce = check_str($_POST["announce"]);
+		$enter_sound = check_str($_POST["enter_sound"]);
+		$mute = check_str($_POST["mute"]);
+		$created = check_str($_POST["created"]);
+		$created_by = check_str($_POST["created_by"]);
+		$enabled = check_str($_POST["enabled"]);
+		$description = check_str($_POST["description"]);
+
+		//remove any pin number formatting
+		$member_pin = preg_replace('{\D}', '', $member_pin);
+	}
+
+//delete the user from the v_extension_users
+	if ($_GET["a"] == "delete" && permission_exists('conference_session_add') && permission_exists('conference_session_edit')) {
+		if (strlen($_REQUEST["meeting_user_uuid"]) > 0) {
+			//set the variables
+				$meeting_user_uuid = check_str($_REQUEST["meeting_user_uuid"]);
+				$conference_session_uuid = check_str($_REQUEST["conference_session_uuid"]);
+			//delete the extension from the ring_group
+				$sql = "delete from v_meeting_users ";
+				$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
+				$sql .= "and meeting_user_uuid = '$meeting_user_uuid' ";
+				$db->exec(check_sql($sql));
+				unset($sql);
+		}
+		if (strlen($_REQUEST["meeting_pin_uuid"]) > 0) {
+			//set the variables
+				$meeting_pin_uuid = check_str($_REQUEST["meeting_pin_uuid"]);
+				$conference_session_uuid = check_str($_REQUEST["conference_session_uuid"]);
+			//delete the extension from the ring_group
+				$sql = "delete from v_meeting_pins ";
+				$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
+				$sql .= "and meeting_pin_uuid = '$meeting_pin_uuid' ";
+				$db->exec(check_sql($sql));
+				unset($sql);
+		}
+		//redirect the browser
+			require_once "includes/header.php";
+			echo "<meta http-equiv=\"refresh\" content=\"2;url=conference_session_edit.php?id=$conference_session_uuid\">\n";
+			echo "<div align='center'>Delete Complete</div>";
+			require_once "includes/footer.php";
+			return;
+	}
+
+if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
+
+	$msg = '';
+	if ($action == "update") {
+		$conference_session_uuid = check_str($_POST["conference_session_uuid"]);
+	}
+
+	//check for all required data
+		//if (strlen($conference_uuid) == 0) { $msg .= "Please provide: Conference UUID<br>\n"; }
+		//if (strlen($max_members) == 0) { $msg .= "Please provide: Max Members<br>\n"; }
+		//if (strlen($wait_mod) == 0) { $msg .= "Please provide: Wait for the Moderator<br>\n"; }
+		if (strlen($announce) == 0) { $msg .= "Please provide: Announce<br>\n"; }
+		//if (strlen($enter_sound) == 0) { $msg .= "Please provide: Enter Sound<br>\n"; }
+		if (strlen($mute) == 0) { $msg .= "Please provide: Mute<br>\n"; }
+		//if (strlen($created) == 0) { $msg .= "Please provide: Created<br>\n"; }
+		//if (strlen($created_by) == 0) { $msg .= "Please provide: Created By<br>\n"; }
+		if (strlen($enabled) == 0) { $msg .= "Please provide: Enabled<br>\n"; }
+		//if (strlen($description) == 0) { $msg .= "Please provide: Description<br>\n"; }
+		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
+			require_once "includes/header.php";
+			require_once "includes/persistformvar.php";
+			echo "<div align='center'>\n";
+			echo "<table><tr><td>\n";
+			echo $msg."<br />";
+			echo "</td></tr></table>\n";
+			persistformvar($_POST);
+			echo "</div>\n";
+			require_once "includes/footer.php";
+			return;
+		}
+
+	//add or update the database
+		if ($_POST["persistformvar"] != "true") {
+
+			if ($action == "add" && permission_exists('conference_session_add')) {
+				//add a meeting
+					$meeting_uuid = uuid();
+					$sql = "insert into v_meetings ";
+					$sql .= "(";
+					$sql .= "domain_uuid, ";
+					$sql .= "meeting_uuid, ";
+					//$sql .= "created, ";
+					//$sql .= "created_by, ";
+					$sql .= "meeting_enabled, ";
+					$sql .= "meeting_description ";
+					$sql .= ")";
+					$sql .= "values ";
+					$sql .= "(";
+					$sql .= "'$domain_uuid', ";
+					$sql .= "'$meeting_uuid', ";
+					//$sql .= "'$created', ";
+					//$sql .= "'$created_by', ";
+					$sql .= "'$enabled', ";
+					$sql .= "'$description' ";
+					$sql .= ")";
+					$db->exec(check_sql($sql));
+					unset($sql);
+
+				//add a conference session
+					$conference_session_uuid = uuid();
+					$sql = "insert into v_conference_sessions ";
+					$sql .= "(";
+					$sql .= "domain_uuid, ";
+					$sql .= "conference_session_uuid, ";
+					$sql .= "conference_uuid, ";
+					$sql .= "meeting_uuid, ";
+					$sql .= "max_members, ";
+					$sql .= "wait_mod, ";
+					$sql .= "announce, ";
+					$sql .= "enter_sound, ";
+					$sql .= "mute, ";
+					$sql .= "created, ";
+					$sql .= "created_by, ";
+					$sql .= "enabled, ";
+					$sql .= "description ";
+					$sql .= ")";
+					$sql .= "values ";
+					$sql .= "(";
+					$sql .= "'$domain_uuid', ";
+					$sql .= "'$conference_session_uuid', ";
+					$sql .= "'$conference_uuid', ";
+					$sql .= "'$meeting_uuid', ";
+					$sql .= "'$max_members', ";
+					$sql .= "'$wait_mod', ";
+					$sql .= "'$announce', ";
+					$sql .= "'$enter_sound', ";
+					$sql .= "'$mute', ";
+					$sql .= "now(), ";
+					$sql .= "'".$_SESSION['user_uuid']."', ";
+					$sql .= "'$enabled', ";
+					$sql .= "'$description' ";
+					$sql .= ")";
+					$db->exec(check_sql($sql));
+					unset($sql);
+
+			} //if ($action == "add")
+
+			if ($action == "update" && permission_exists('conference_session_edit')) {
+				//get the meeting_uuid
+					if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
+						$conference_session_uuid = check_str($_GET["id"]);
+						$sql = "select * from v_conference_sessions ";
+						$sql .= "where domain_uuid = '$domain_uuid' ";
+						$sql .= "and conference_session_uuid = '$conference_session_uuid' ";
+						$prep_statement = $db->prepare(check_sql($sql));
+						$prep_statement->execute();
+						$result = $prep_statement->fetchAll();
+						foreach ($result as &$row) {
+							$meeting_uuid = $row["meeting_uuid"];
+						}
+						unset ($prep_statement);
+					}
+
+				//update conference meetings
+					$sql = "update v_meetings set ";
+					$sql .= "enabled = '$enabled', ";
+					$sql .= "description = '$description' ";
+					$sql .= "where domain_uuid = '$domain_uuid' ";
+					$sql .= "and meeting_uuid = '$meeting_uuid' ";
+					$db->exec(check_sql($sql));
+					unset($sql);
+
+				//update conferences sessions
+					$sql = "update v_conference_sessions set ";
+					$sql .= "conference_uuid = '$conference_uuid', ";
+					//$sql .= "meeting_uuid = '$meeting_uuid', ";
+					$sql .= "max_members = '$max_members', ";
+					$sql .= "wait_mod = '$wait_mod', ";
+					$sql .= "announce = '$announce', ";
+					$sql .= "enter_sound = '$enter_sound', ";
+					$sql .= "mute = '$mute', ";
+					$sql .= "enabled = '$enabled', ";
+					$sql .= "description = '$description' ";
+					$sql .= "where domain_uuid = '$domain_uuid' ";
+					$sql .= "and conference_session_uuid = '$conference_session_uuid' ";
+					//echo $sql; //exit;
+					$db->exec(check_sql($sql));
+					unset($sql);
+
+			} //if ($action == "update")
+
+			//assign the user to the meeting
+				if (strlen($user_uuid) > 0) {
+					$meeting_user_uuid = uuid();
+					$sql = "insert into v_meeting_users ";
+					$sql .= "(";
+					$sql .= "domain_uuid, ";
+					$sql .= "meeting_user_uuid, ";
+					$sql .= "meeting_uuid, ";
+					$sql .= "user_uuid ";
+					$sql .= ")";
+					$sql .= "values ";
+					$sql .= "(";
+					$sql .= "'$domain_uuid', ";
+					$sql .= "'$meeting_user_uuid', ";
+					$sql .= "'$meeting_uuid', ";
+					$sql .= "'$user_uuid' ";
+					$sql .= ")";
+					//echo $sql; //exit;
+					$db->exec(check_sql($sql));
+					unset($sql);
+				}
+
+			//assign the pin numbers to the meeting
+				if (strlen($member_pin) > 0) {
+					$meeting_pin_uuid = uuid();
+					$sql = "insert into v_meeting_pins ";
+					$sql .= "(";
+					$sql .= "domain_uuid, ";
+					$sql .= "meeting_pin_uuid, ";
+					$sql .= "meeting_uuid, ";
+					$sql .= "member_pin, ";
+					$sql .= "member_type ";
+					$sql .= ")";
+					$sql .= "values ";
+					$sql .= "(";
+					$sql .= "'$domain_uuid', ";
+					$sql .= "'$meeting_pin_uuid', ";
+					$sql .= "'$meeting_uuid', ";
+					$sql .= "'$member_pin', ";
+					$sql .= "'$member_type' ";
+					$sql .= ")";
+					//echo $sql; //exit;
+					$db->exec(check_sql($sql));
+					unset($sql);
+				}
+
+			//redirect the user
+				require_once "includes/header.php";
+				echo "<meta http-equiv=\"refresh\" content=\"2;url=conference_session_edit.php?id=$conference_session_uuid\">\n";
+				echo "<div align='center'>\n";
+				echo "Update Complete\n";
+				echo "</div>\n";
+				require_once "includes/footer.php";
+				return;
+
+		} //if ($_POST["persistformvar"] != "true")
+} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
+
+//pre-populate the form
+	if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
+		$conference_session_uuid = check_str($_GET["id"]);
+		$sql = "select * from v_conference_sessions ";
+		$sql .= "where domain_uuid = '$domain_uuid' ";
+		$sql .= "and conference_session_uuid = '$conference_session_uuid' ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		$result = $prep_statement->fetchAll();
+		foreach ($result as &$row) {
+			$conference_uuid = $row["conference_uuid"];
+			$meeting_uuid = $row["meeting_uuid"];
+			$max_members = $row["max_members"];
+			$wait_mod = $row["wait_mod"];
+			$announce = $row["announce"];
+			$enter_sound = $row["enter_sound"];
+			$mute = $row["mute"];
+			$created = $row["created"];
+			$created_by = $row["created_by"];
+			$enabled = $row["enabled"];
+			$description = $row["description"];
+			break; //limit to 1 row
+		}
+		unset ($prep_statement);
+	}
+
+//set default values
+	if (strlen($max_members) == 0) { $max_members = 0; }
+	if (strlen($wait_mod) == 0) { $wait_mod = 'false'; }
+	if (strlen($announce) == 0) { $announce = 'true'; }
+	if (strlen($enter_sound) == 0) { $enter_sound = 'tone_stream://%(200,0,500,600,700)'; }
+	if (strlen($mute) == 0) { $mute = 'false'; }
+	if (strlen($enabled) == 0) { $enabled = 'true'; }
+
+//show the header
+	require_once "includes/header.php";
+
+//show the content
+	echo "<div align='center'>";
+	echo "<table width='100%' border='0' cellpadding='0' cellspacing=''>\n";
+	echo "<tr class='border'>\n";
+	echo "	<td align=\"left\">\n";
+	echo "		<br>";
+
+	echo "<form method='post' name='frm' action=''>\n";
+	echo "<div align='center'>\n";
+	echo "<table width='100%'  border='0' cellpadding='6' cellspacing='0'>\n";
+	echo "<tr>\n";
+	echo "<td align='left' width='30%' nowrap='nowrap'><b>Conference Sessions</b></td>\n";
+	echo "<td width='70%' align='right'>\n";
+	if (strlen($meeting_uuid) > 0) {
+		echo "	<input type='button' class='btn' name='' alt='back' onclick=\"window.location='/app/conferences_active/conference_interactive.php?c=".$meeting_uuid."'\" value='View'>\n";
+	}
+	echo "	<input type='button' class='btn' name='' alt='back' onclick=\"window.location='conference_sessions.php'\" value='Back'>\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	Conference Name:\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<select class='formfld' name='conference_uuid'>\n";
+	$sql = "select * from v_conferences ";
+	$sql .= "where domain_uuid = '$domain_uuid' ";
+	$sql .= "order by conference_name asc ";
+	$prep_statement = $db->prepare(check_sql($sql));
+	$prep_statement->execute();
+	$x = 0;
+	$result = $prep_statement->fetchAll(PDO::FETCH_ASSOC);
+	foreach ($result as &$row) {
+		if ($conference_uuid == $row["conference_uuid"]) {
+			echo "		<option value='".$row["conference_uuid"]."' selected='selected'>".$row["conference_name"]."</option>\n";
+		}
+		else {
+			echo "		<option value='".$row["conference_uuid"]."'>".$row["conference_name"]."</option>\n";
+		}
+		$x++;
+	}
+	unset ($prep_statement);
+	echo "	</select>\n";
+	echo "	<br />\n";
+	echo "\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "	<tr>";
+	echo "		<td class='vncell' valign='top'>Users:</td>";
+	echo "		<td class='vtable' align='left'>";
+	if ($action == "update") {
+		echo "			<table border='0' style='width : 235px;'>\n";
+		$sql = "SELECT * FROM v_users as u, v_meeting_users as m ";
+		$sql .= "where u.user_uuid = m.user_uuid  ";
+		$sql .= "and m.domain_uuid = '".$_SESSION['domain_uuid']."' ";
+		$sql .= "and m.meeting_uuid = '$meeting_uuid' ";
+		$sql .= "order by u.username asc ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+		$result_count = count($result);
+		foreach($result as $field) {
+			echo "			<tr>\n";
+			echo "				<td class='vtable'>".$field['username']."</td>\n";
+			echo "				<td style='width : 25px;' align='right'>\n";
+			echo "					<a href='conference_session_edit.php?meeting_user_uuid=".$field['meeting_user_uuid']."&conference_session_uuid=".$conference_session_uuid."&a=delete' alt='delete' onclick=\"return confirm('Do you really want to delete this?')\">$v_link_label_delete</a>\n";
+			echo "				</td>\n";
+			echo "			</tr>\n";
+		}
+		echo "			</table>\n";
+	}
+	echo "			<br />\n";
+	$sql = "SELECT * FROM v_users ";
+	$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
+	$sql .= "order by username asc ";
+	$prep_statement = $db->prepare(check_sql($sql));
+	$prep_statement->execute();
+	echo "			<select name=\"user_uuid\" class='frm'>\n";
+	echo "			<option value=\"\"></option>\n";
+	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+	foreach($result as $field) {
+		echo "			<option value='".$field['user_uuid']."'>".$field['username']."</option>\n";
+	}
+	echo "			</select>";
+	if ($action == "update") {
+		echo "			<input type=\"submit\" class='btn' value=\"Add\">\n";
+	}
+	unset($sql, $result);
+	echo "			<br>\n";
+	echo "			Assign the user to the conference session.\n";
+	echo "			<br />\n";
+	echo "		</td>";
+	echo "	</tr>";
+
+	echo "	<tr>";
+	echo "		<td class='vncell' valign='top'>PIN Numbers:</td>";
+	echo "		<td class='vtable' align='left'>";
+	if ($action == "update") {
+		echo "			<table border='0' style='width : 235px;'>\n";
+		$sql = "SELECT * FROM v_meeting_pins ";
+		$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
+		$sql .= "order by member_pin asc ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+		$result_count = count($result);
+		foreach($result as $field) {
+			echo "			<tr>\n";
+			echo "				<td class='vtable'>".$field['member_pin']."</td>\n";
+			echo "				<td class='vtable'>".$field['member_type']."</td>\n";
+			echo "				<td style='width : 25px;' align='right'>\n";
+			echo "					<a href='conference_session_edit.php?meeting_pin_uuid=".$field['meeting_pin_uuid']."&conference_session_uuid=".$conference_session_uuid."&a=delete' alt='delete' onclick=\"return confirm('Do you really want to delete this?')\">$v_link_label_delete</a>\n";
+			echo "				</td>\n";
+			echo "			</tr>\n";
+		}
+		echo "			</table>\n";
+	}
+	echo "			<br />\n";
+	echo "			<table border='0' style='width : 245px;'>\n";
+	echo "				<tr>\n";
+	echo "				<td nowrap='nowrap'>\n";
+	echo "					<input class='formfld' type='text' name='member_pin' style='width : 125px;' value=''>\n";
+	echo "				</td>\n";
+	echo "				<td>\n";
+	echo "					<select class='formfld' name='member_type' style='width : 100px;'>\n";
+	if ($mute == "participant") { 
+		echo "				<option value='participant' selected='selected'>participant</option>\n";
+	}
+	else {
+		echo "				<option value='participant'>participant</option>\n";
+	}
+	if ($mute == "moderator") { 
+		echo "				<option value='moderator' selected='selected'>moderator</option>\n";
+	}
+	else {
+		echo "				<option value='moderator'>moderator</option>\n";
+	}
+	echo "					</select>\n";
+	echo "				</td>\n";
+	if ($action == "update") {
+		echo "				<td>\n";
+		echo "					<input type=\"submit\" class='btn' value=\"Add\">\n";
+		echo "				</td>\n";
+	}
+	echo "				</tr>\n";
+	echo "			</table>\n";
+	unset($sql, $result);
+	echo "			Pin numbers for the moderators or participants.\n";
+	echo "			<br />\n";
+	echo "		</td>";
+	echo "	</tr>";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	Max Members:\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "  <input class='formfld' type='text' name='max_members' maxlength='255' value='$max_members'>\n";
+	echo "<br />\n";
+	echo "\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	Wait for Moderator:\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<select class='formfld' name='wait_mod'>\n";
+	echo "	<option value=''></option>\n";
+	if ($announce == "true") { 
+		echo "	<option value='true' selected='selected'>true</option>\n";
+	}
+	else {
+		echo "	<option value='true'>true</option>\n";
+	}
+	if ($announce == "false") { 
+		echo "	<option value='false' selected='selected'>false</option>\n";
+	}
+	else {
+		echo "	<option value='false'>false</option>\n";
+	}
+	echo "	</select>\n";
+	echo "<br />\n";
+	echo "\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	Announce:\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<select class='formfld' name='announce'>\n";
+	echo "	<option value=''></option>\n";
+	if ($announce == "true") { 
+		echo "	<option value='true' selected='selected'>true</option>\n";
+	}
+	else {
+		echo "	<option value='true'>true</option>\n";
+	}
+	if ($announce == "false") { 
+		echo "	<option value='false' selected='selected'>false</option>\n";
+	}
+	else {
+		echo "	<option value='false'>false</option>\n";
+	}
+	echo "	</select>\n";
+	echo "<br />\n";
+	echo "\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	Enter Sound:\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='enter_sound' maxlength='255' value=\"$enter_sound\">\n";
+	echo "<br />\n";
+	echo "\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	Mute:\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<select class='formfld' name='mute'>\n";
+	echo "	<option value=''></option>\n";
+	if ($mute == "true") { 
+		echo "	<option value='true' selected='selected'>true</option>\n";
+	}
+	else {
+		echo "	<option value='true'>true</option>\n";
+	}
+	if ($mute == "false") { 
+		echo "	<option value='false' selected='selected'>false</option>\n";
+	}
+	else {
+		echo "	<option value='false'>false</option>\n";
+	}
+	echo "	</select>\n";
+	echo "<br />\n";
+	echo "\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	/*
+	if ($action == "update" && permission_exists('conference_session_edit')) {
+		echo "<tr>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "	Created:\n";
+		echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "	<table border='0' width='100%' cellpadding='0' cellspacing='0'>\n";
+		echo "	<tr>\n";
+		echo "	<td valign='top' align='top'><input name='created' readonly class='formfld' value='$created' type='text' class='formfld' onclick='popUpCalendar(this, this, \"mm/dd/yyyy\");'></td>\n";
+		echo "	<td valign='middle' align='top' width='20' align='right'><img src='/images/icon_calendar.gif' onclick='popUpCalendar(this, frm.created, \"mm/dd/yyyy\");'></td>\n";
+		echo "	</tr>\n";
+		echo "	</table>\n";
+		echo "<br />\n";
+		echo "\n";
+		echo "</td>\n";
+		echo "</tr>\n";
+
+		echo "<tr>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "	Created By:\n";
+		echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "	<input class='formfld' type='text' name='created_by' maxlength='255' value=\"$created_by\">\n";
+		echo "<br />\n";
+		echo "\n";
+		echo "</td>\n";
+		echo "</tr>\n";
+	}
+	*/
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	Enabled:\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<select class='formfld' name='enabled'>\n";
+	echo "	<option value=''></option>\n";
+	if ($enabled == "true") { 
+		echo "	<option value='true' selected='selected'>true</option>\n";
+	}
+	else {
+		echo "	<option value='true'>true</option>\n";
+	}
+	if ($enabled == "false") { 
+		echo "	<option value='false' selected='selected'>false</option>\n";
+	}
+	else {
+		echo "	<option value='false'>false</option>\n";
+	}
+	echo "	</select>\n";
+	echo "<br />\n";
+	echo "\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	Description:\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='description' maxlength='255' value=\"$description\">\n";
+	echo "<br />\n";
+	echo "\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+	echo "	<tr>\n";
+	echo "		<td colspan='2' align='right'>\n";
+	if ($action == "update") {
+		echo "				<input type='hidden' name='conference_session_uuid' value='$conference_session_uuid'>\n";
+	}
+	echo "				<input type='submit' name='submit' class='btn' value='Save'>\n";
+	echo "		</td>\n";
+	echo "	</tr>";
+	echo "</table>";
+	echo "</form>";
+
+	echo "	</td>";
+	echo "	</tr>";
+	echo "</table>";
+	echo "</div>";
+
+//include the footer
+	require_once "includes/footer.php";
+?>
\ No newline at end of file
diff --git a/app/conference_sessions/conference_sessions.php b/app/conference_sessions/conference_sessions.php
new file mode 100644
index 0000000000..74368482ae
--- /dev/null
+++ b/app/conference_sessions/conference_sessions.php
@@ -0,0 +1,156 @@
+<?php
+require_once "root.php";
+require_once "includes/require.php";
+require_once "includes/checkauth.php";
+if (permission_exists('conference_session_view')) {
+	//access granted
+}
+else {
+	echo "access denied";
+	exit;
+}
+require_once "includes/header.php";
+require_once "includes/paging.php";
+
+//get variables used to control the order
+	$order_by = $_GET["order_by"];
+	$order = $_GET["order"];
+
+//show the content
+	echo "<div align='center'>";
+	echo "<table width='100%' border='0' cellpadding='0' cellspacing='2'>\n";
+	echo "<tr class='border'>\n";
+	echo "	<td align=\"center\">\n";
+	echo "		<br />";
+
+	echo "<table width='100%' border='0'>\n";
+	echo "	<tr>\n";
+	echo "		<td width='50%' align='left' nowrap='nowrap'><b>Conference Sessions</b></td>\n";
+	echo "		<td width='50%' align='right'>&nbsp;</td>\n";
+	echo "	</tr>\n";
+	echo "</table>\n";
+
+	//prepare to page the results
+		$sql = "select count(*) as num_rows from v_conference_sessions ";
+		$sql .= "where domain_uuid = '$domain_uuid' ";
+		if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
+		$prep_statement = $db->prepare($sql);
+		if ($prep_statement) {
+		$prep_statement->execute();
+			$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
+			if ($row['num_rows'] > 0) {
+				$num_rows = $row['num_rows'];
+			}
+			else {
+				$num_rows = '0';
+			}
+		}
+
+	//prepare to page the results
+		$rows_per_page = 10;
+		$param = "";
+		$page = $_GET['page'];
+		if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } 
+		list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page); 
+		$offset = $rows_per_page * $page; 
+
+	//get the list
+		$sql = "select * from v_conference_sessions ";
+		$sql .= "where domain_uuid = '$domain_uuid' ";
+		if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
+		$sql .= "limit $rows_per_page offset $offset ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		$result = $prep_statement->fetchAll();
+		$result_count = count($result);
+		unset ($prep_statement, $sql);
+
+	$c = 0;
+	$row_style["0"] = "row_style0";
+	$row_style["1"] = "row_style1";
+
+	echo "<div align='center'>\n";
+	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
+	echo "<tr>\n";
+	//echo th_order_by('conference_uuid', 'Conference UUID', $order_by, $order);
+	//echo th_order_by('meeting_uuid', 'Meeting UUID', $order_by, $order);
+	echo th_order_by('max_members', 'Max Members', $order_by, $order);
+	echo th_order_by('wait_mod', 'Wait for Moderator', $order_by, $order);
+	echo th_order_by('announce', 'Announce', $order_by, $order);
+	//echo th_order_by('enter_sound', 'Enter Sound', $order_by, $order);
+	echo th_order_by('mute', 'Mute', $order_by, $order);
+	//echo th_order_by('created', 'Created', $order_by, $order);
+	//echo th_order_by('created_by', 'Created By', $order_by, $order);
+	echo th_order_by('enabled', 'Enabled', $order_by, $order);
+	echo th_order_by('description', 'Description', $order_by, $order);
+	echo "<td align='right' width='42'>\n";
+	if (permission_exists('conference_session_add')) {
+		echo "	<a href='conference_session_edit.php' alt='add'>$v_link_label_add</a>\n";
+	}
+	else {
+		echo "	&nbsp;\n";
+	}
+	echo "</td>\n";
+	echo "<tr>\n";
+
+	if ($result_count > 0) {
+		foreach($result as $row) {
+			echo "<tr >\n";
+			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['conference_uuid']."&nbsp;</td>\n";
+			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['meeting_uuid']."&nbsp;</td>\n";
+			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['max_members']."&nbsp;</td>\n";
+			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['wait_mod']."&nbsp;</td>\n";
+			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['announce']."&nbsp;</td>\n";
+			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['enter_sound']."&nbsp;</td>\n";
+			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['mute']."&nbsp;</td>\n";
+			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['created']."&nbsp;</td>\n";
+			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['created_by']."&nbsp;</td>\n";
+			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['enabled']."&nbsp;</td>\n";
+			echo "	<td valign='top' class='row_stylebg' width='30%'>".$row['description']."&nbsp;</td>\n";
+			echo "	<td valign='top' align='right'>\n";
+			if (permission_exists('conference_session_edit')) {
+				echo "		<a href='conference_session_edit.php?id=".$row['conference_session_uuid']."' alt='edit'>$v_link_label_edit</a>\n";
+			}
+			if (permission_exists('conference_session_delete')) {
+				echo "		<a href='conference_session_delete.php?id=".$row['conference_session_uuid']."' alt='delete' onclick=\"return confirm('Do you really want to delete this?')\">$v_link_label_delete</a>\n";
+			}
+			echo "	</td>\n";
+			echo "</tr>\n";
+			if ($c==0) { $c=1; } else { $c=0; }
+		} //end foreach
+		unset($sql, $result, $row_count);
+	} //end if results
+
+	echo "<tr>\n";
+	echo "<td colspan='12' align='left'>\n";
+	echo "	<table width='100%' cellpadding='0' cellspacing='0'>\n";
+	echo "	<tr>\n";
+	echo "		<td width='33.3%' nowrap>&nbsp;</td>\n";
+	echo "		<td width='33.3%' align='center' nowrap>$paging_controls</td>\n";
+	echo "		<td width='33.3%' align='right'>\n";
+	if (permission_exists('conference_session_add')) {
+		echo "			<a href='conference_session_edit.php' alt='add'>$v_link_label_add</a>\n";
+	}
+	else {
+		echo "			&nbsp;\n";
+	}
+	echo "		</td>\n";
+	echo "	</tr>\n";
+ 	echo "	</table>\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "</table>";
+	echo "</div>";
+	echo "<br /><br />";
+	echo "<br /><br />";
+
+	echo "</td>";
+	echo "</tr>";
+	echo "</table>";
+	echo "</div>";
+	echo "<br /><br />";
+
+//include the footer
+	require_once "includes/footer.php";
+?>
\ No newline at end of file
diff --git a/app/conference_sessions/root.php b/app/conference_sessions/root.php
new file mode 100644
index 0000000000..7b882438ea
--- /dev/null
+++ b/app/conference_sessions/root.php
@@ -0,0 +1,50 @@
+<?php
+/*
+	FusionPBX
+	Version: MPL 1.1
+
+	The contents of this file are subject to the Mozilla Public License Version
+	1.1 (the "License"); you may not use this file except in compliance with
+	the License. You may obtain a copy of the License at
+	http://www.mozilla.org/MPL/
+
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+	for the specific language governing rights and limitations under the
+	License.
+
+	The Original Code is FusionPBX
+
+	The Initial Developer of the Original Code is
+	Mark J Crane <markjcrane@fusionpbx.com>
+	Portions created by the Initial Developer are Copyright (C) 2008-2012
+	the Initial Developer. All Rights Reserved.
+
+	Contributor(s):
+	Mark J Crane <markjcrane@fusionpbx.com>
+*/
+
+// make sure the PATH_SEPARATOR is defined
+	if (!defined("PATH_SEPARATOR")) {
+		if ( strpos( $_ENV[ "OS" ], "Win" ) !== false ) { define("PATH_SEPARATOR", ";"); } else { define("PATH_SEPARATOR", ":"); }
+	}
+
+// make sure the document_root is set
+	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", "/", $_SERVER["SCRIPT_FILENAME"]);
+	$_SERVER["DOCUMENT_ROOT"] = str_replace($_SERVER["PHP_SELF"], "", $_SERVER["SCRIPT_FILENAME"]);
+	$_SERVER["DOCUMENT_ROOT"] = realpath($_SERVER["DOCUMENT_ROOT"]);
+	//echo "DOCUMENT_ROOT: ".$_SERVER["DOCUMENT_ROOT"]."<br />\n";
+	//echo "PHP_SELF: ".$_SERVER["PHP_SELF"]."<br />\n";
+	//echo "SCRIPT_FILENAME: ".$_SERVER["SCRIPT_FILENAME"]."<br />\n";
+
+// if the project directory exists then add it to the include path otherwise add the document root to the include path
+	if (is_dir($_SERVER["DOCUMENT_ROOT"].'/fusionpbx')){
+		if(!defined('PROJECT_PATH')) { define('PROJECT_PATH', '/fusionpbx'); }
+		set_include_path( get_include_path() . PATH_SEPARATOR . $_SERVER["DOCUMENT_ROOT"].'/fusionpbx' );
+	}
+	else {
+		if(!defined('PROJECT_PATH')) { define('PROJECT_PATH', ''); }
+		set_include_path( get_include_path() . PATH_SEPARATOR . $_SERVER['DOCUMENT_ROOT'] );
+	}
+
+?>
\ No newline at end of file