Merge branch 'master' into components_feature
Merge remote-tracking branch 'origin/master' into components_feature
Merge remote-tracking branch 'origin/master' into components_feature
Fixed buttons to work with the latest layout.coffee.
Merge remote-tracking branch 'remotes/origin/components_feature'