Merge remote-tracking branch 'origin/CRAFTERCMS-392'
Merge remote-tracking branch 'upstream/master'
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
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
Merge pull request #155 from quiaro/master

Overrides Share's default login screen styles
Merge remote-tracking branch 'upstream/master'
Enterprise dependencies added for alfresco 4.2.0
Merge pull request #156 from dejan-brkic/4.2.0-ent

4.2.0 ent
CRAFTERCMS-562
Removed duplicated jar file from artifact
Merge pull request #157 from dejan-brkic/CRAFTERCMS-562

CRAFTERCMS-562
v2.2.4 Release
prepare for next development iteration
fixes 2.4.0 commons Utils dependency
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