Made the javascript a little bit less ugly
git pushMerge branch 'mark' of github.com:nedforce/devcms-core into mark