added aliasId to the Content model
Merge branch 'master' into zee-rings