some changes on the front end
Merge remote-tracking branch 'origin/master'