Edit view
Main php
Merge remote-tracking branch 'origin/master'