Alfresco 4.2 upgrade
Merge remote-tracking branch 'upstream/master' into alfresco-4.2
Merge pull request #119 from dejan-brkic/master

CRAFTERCMS-531