Need to commit to merge upstream/master
Merge remote-tracking branch 'upstream/master'
Added 'asset' to concrete/config/app.php aliases
Merge pull request #1162 from olliephillips/master

Added 'asset' to concrete/config/app.php aliases