Merge branch 'ubuntu14.04/v1.1' of https://github.com/ged-lab/2012-paper-diginorm into ubuntu14.04/v1.1