photoAlbum add admin findbyId
Merge branch 'develop' of git://github.com/antwebes/ChateaClientBundle into develop
Add nick to register
Merge branch 'develop' of https://github.com/antwebes/ChateaClientBundle into develop
Merge branch 'master' into develop