Merge branch 'stable'
restructured user profile settings
Merge branch 'profile' into next