Merge pull request #142 from dejan-brkic/CRAFTERCMS-556

CRAFTERCMS-557
Merge pull request #145 from dejan-brkic/CRAFTERCMS-558

CRAFTERCMS-558
Merge pull request #148 from dejan-brkic/CRAFTERCMS-392

CRAFTERCMS-392
CRAFTERCMS-392: Redirect to sign-in page when session times out
Merge pull request #151 from quiaro/2.2.x

CRAFTERCMS-392: Redirect to sign-in page when session times out
Merge pull request #152 from quiaro/2.3.x

CRAFTERCMS-392: Redirect to sign-in page when session times out
2.3.1 Release
prepare for next development iteration
Fix wrong alfresco version in 2.2.x branch
Merge pull request #154 from dejan-brkic/2.2.x-0

Fix wrong alfresco version in 2.2.x branch
v2.2.4 Release
prepare for next development iteration
CRAFTERCMS-578
Added check if component content file exist before flattening page xml
CRAFTERCMS-578
Added check if component content file exist before flattening page xml
Merge pull request #161 from dejan-brkic/2.3.x

CRAFTERCMS-578
CRAFTERCMS-565: Upgrades TinyMCE to version 3.5.10

Custom CStudio files/folders:

* plugins/cs_contextmenu
* plugins/cs_inlinepopups
* plugins/cs_table
* themes/advanced/skins/cstudio-rte/

* themes/advanced/js/link.js
* themes/advanced/anchor.htm
* themes/advanced/readme.txt
* themes/advanced/editor_template.js
Checks if keyboardNav exists in the color picker before destroying it