Merge remote-tracking branch 'origin/master'
data page + minor changes (mainly height) to home page carousel