Alfresco hackathon 2014

Updating my local version with the latest changes