Removing custom Assets controller and cleaning up action lookup.
Merge branch 'master' of github.com:LeakyBucket/charlotte