Merge pull request #12 from wshafer/master

Fix for asset manager and EL-Finder