Ensure $root/app/assets

Closes #154
Merge branch '2.x'