Added setUserNick method
Merge branch 'master' of git://github.com/antwebes/ChateaClientBundle
Removed html regex for nick in User model
add affiliate in user