format
edit controler & view
Merge remote-tracking branch 'origin/develop' into develop