Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
sexual_orientation -> seeking
Merge branch 'develop' of git://github.com/antwebes/ChateaClientBundle into develop