Merge branch 'master' into develop
fosuserbundle sample
Upgrade to symfony 2.4
Upgrade to 2.4
Set custom user bundle layout
Show edit links only for authorized users
Merge branch 'fosuserbundle' into develop
Merge branch 'develop'