User complete [Edit password, description and pp]
Merge branch 'master' of https://github.com/regs0311/SecondView

Conflicts:
secondview/app/View/Layouts/default.ctp
merge