Squashed 'app/' changes from ee13d0d..63eefe7

63eefe7 clearfix

git-subtree-dir: app
git-subtree-split: 63eefe742d46c21b7773e03f8ee31d3bb3dbb70b
Merge commit '825ddd8b3b3f3afe919749da2221ef3c69111733'