Adds in created_at, edited_at, and editor fields for youtube datatype definition
adds support for JSONP requests
Adds a new module for configuring REST called from outside Exponent.
Deletes assoc items when deleting main item for things like attachments, etc... [#960 state:resolved]
(cherry picked from commit 210238b)
Fixes deleteing assoc items when item is deleted
Fixes adding pull ical/google old style link
Adds the tabledef to the EQL export so we can recreate database tables even if the original definition file is missing from the system due to an upgrade, etc....e.g., we want the OLD data so we can run the upgrade script on it...you've already run the upgrade and deleted a few of the modules/controllers files/tables, now you want to re-import an old backup which would fail on the deprecated data since the table no longer exists, nor ifs definition files.

(cherry picked from commit 051002e125a5b40f1b514edc72ab47a95947f19b)

Conflicts:
	framework/modules/file/controllers/fileController.php
Changes fix sessions table method name so it may be used without logging in (since if the table is broken you can't log in)  website.org/administration/fixsessions...the command was removed from the slingbar since it could never be used from there
(cherry picked from commit 7db287f192b14f2c7def1696b68b6352cf163690)
Fixes not display fields/columns when viewing form data from manage forms view [#962 state:resolved]
(cherry picked from commit f578532e0a0dcf23f574ea234d76efae57ae140d)
Adds ability to recreate a deprecated formbuilder data table during EQL import...necessary to import EQL files saves prior to v2.1.4 (before we started also saving tabledef) [#965 state:resolved]
(cherry picked from commit ea327131cf473697af7a9859bb393b9b40163f9b)
Local
(cherry picked from commit 1559140550456b287f4ea1ece31b22d3a6c8007a)
Fixes some upgrade scripts
Updates aggregateWhereClause() methods to be compatible w/ eaasController (PHP 5.4 issue)
Updates changelogs
Removes 'reset session table' from slingbar since if that table is broken you can't log on, and you've you've got permission, you're already logged on
Updates copyright to 2013 (from 2012)
Fixes manual version check to actually work if 'skip auto version check' is turned on
Display message queue at end of eql import to show message to upgrade database
Switches Date/Time default formats to a Windows server friendly version [#961 state:resolved]
Merge branch 'develop' into feature/container2

Conflicts:
	framework/modules/administration/menus/admin.php
	framework/modules/ecommerce/views/order/show_packing.tpl
	install/upgrades/upgrade_forms.php
	install/upgrades/upgrade_navigation.php