admin js, naming
Merge branch '1.2' of github.com:pagelines/DMS into 1.2