Added dev2
Merge remote-tracking branch 'origin/front-end' into front-end