Merge pull request #23 from jeromeall/master

moved content javascript to edit page
moved content js back to its file, added condition for loading script so it only loads on specific page