Adding toArray() and toJSON() to TActiveRecord(cherry picked from commit 3f7dab44ea0b45dcdc5d590d94659010ef1eddda)
Avoid an exception loop on callback error when headers have already been sent; send error trace in the body, since headers are limited in size
(cherry picked from commit 0700ac0eb6d1cb884ca6d568f798ed785c38e908)

Conflicts:
	framework/Web/UI/ActiveControls/TActivePageAdapter.php
Fix: avoid unnecessary scrolling
(cherry picked from commit b2de810e574634c3b443ff5c5ccef5879e3caffd)

Conflicts:
	framework/Web/UI/TClientScriptManager.php
Fix #504
(cherry picked from commit 3d0ecbdc3141740be8d9ddda0a2c6f293dbc099c)
Fix #506
(cherry picked from commit eaaa9da0c4912f782c3a1043b710ac1b598a41a5)
Fix #502
(cherry picked from commit e2fb2ab1e2b5925f16d4dd5c3ac514a0e54ee026)

Conflicts:
	framework/Web/Javascripts/source/prado/controls/slider.js
Update HelloWorld.page

prado-cli.php moved to /bin(cherry picked from commit 00bc3da51fbc0a6231d08c85a44df5762f9c5545)
Update CommandLine.page

prado-cli.php moved to /bin(cherry picked from commit 888f241829e8922e95c5c925a192a50fe34264cd)

Conflicts:
	demos/quickstart/protected/pages/GettingStarted/CommandLine.page
Respect ButtonCssClass property in TActivePager. fix #511
(cherry picked from commit 6784c512fdccd03aee8864b7c94758909d3cd3d0)

Conflicts:
	demos/quickstart/protected/pages/ActiveControls/Samples/TActivePager/Home.page
	framework/Web/UI/ActiveControls/TActivePager.php
TXmlDocument::buildElement visibility changed

This allows derived classes to override the method's implementation
(cherry picked from commit 69f6eddaba7425392e5d0f7893155390eda244fc)
Added missing "static" keywords in TGettext; fix #518
(cherry picked from commit f550fd22072fb189762d45d8e9f077423c439c6b)
Fix #519
(cherry picked from commit 3abca1f10ace63b2daa93870f17049c047b53abe)
Fix #515
(cherry picked from commit f95623e43ce5829b91d1fde0e7978aca96e3e936)
Fixed #516 , added test case
(cherry picked from commit c66097eac2c2691bf0047829275962ec0bf2b41f)
re fix #246
(cherry picked from commit b4599f7b557902f6a3eb7aaa7facb86c9d1349cc)
IE7+IE8 compatibility (fixes #520)
(cherry picked from commit 5cd010cb008b6e28988de5a5b7e9e769eea80907)

Conflicts:
	framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
Added new test case directory for github issues; added test case for #504
(cherry picked from commit 6dffcae480706f7c3583c5cfd4360c6c11aacabb)
Testcase for Issue #524
(cherry picked from commit 37a1d886c6960080bbd03cad757c722b494a0220)
Convert encoding of all values inside an array before json_serialize (Fixes #524)
(cherry picked from commit 8e07d0781150206fae722d9b9dcbdafd727665f6)
Fix 526
(cherry picked from commit 071f22c5c038c962823af003a28663d0d2734a16)