admin+js
Merge pull request #1 from EE/feature/adminAndJavascripts

admin+js