editar beach
Merge branch 'master' of https://github.com/NiuMedia/PlayaLaravel4