Lots of front end changes
Merge remote-tracking branch 'upstream/master'