image and relationship with album
Merge branch 'master' of https://github.com/juankbrera/contman
Merge remote-tracking branch 'origin/master' into dev-juankbrera