Merge branch 'master' of /home/git/platal into profile_edit