Dev1 front-end ready
Change 1
Added dev2
Merge remote-tracking branch 'origin/front-end' into front-end